diff --git a/splunklib/binding.py b/splunklib/binding.py index 25a09948..c5f361b8 100644 --- a/splunklib/binding.py +++ b/splunklib/binding.py @@ -39,8 +39,8 @@ from http import client from http.cookies import SimpleCookie from xml.etree.ElementTree import XML, ParseError -from splunklib.data import record -from splunklib import __version__ +from .data import record +from . import __version__ logger = logging.getLogger(__name__) diff --git a/splunklib/client.py b/splunklib/client.py index ee390c9e..c78ea88d 100644 --- a/splunklib/client.py +++ b/splunklib/client.py @@ -68,9 +68,9 @@ from time import sleep from urllib import parse -from splunklib import data -from splunklib.data import record -from splunklib.binding import (AuthenticationError, Context, HTTPError, UrlEncoded, +from . import data +from .data import record +from .binding import (AuthenticationError, Context, HTTPError, UrlEncoded, _encode, _make_cookie_header, _NoAuthenticationToken, namespace) @@ -3999,4 +3999,4 @@ def batch_save(self, *documents): data = json.dumps(documents) return json.loads( - self._post('batch_save', headers=KVStoreCollectionData.JSON_HEADER, body=data).body.read().decode('utf-8')) \ No newline at end of file + self._post('batch_save', headers=KVStoreCollectionData.JSON_HEADER, body=data).body.read().decode('utf-8')) diff --git a/splunklib/modularinput/event.py b/splunklib/modularinput/event.py index 7ee7266a..bebd61e4 100644 --- a/splunklib/modularinput/event.py +++ b/splunklib/modularinput/event.py @@ -15,7 +15,7 @@ from io import TextIOBase import xml.etree.ElementTree as ET -from splunklib.utils import ensure_str +from ..utils import ensure_str class Event: diff --git a/splunklib/modularinput/event_writer.py b/splunklib/modularinput/event_writer.py index 7be3845a..7ea37ca8 100644 --- a/splunklib/modularinput/event_writer.py +++ b/splunklib/modularinput/event_writer.py @@ -15,7 +15,7 @@ import sys import traceback -from splunklib.utils import ensure_str +from ..utils import ensure_str from .event import ET diff --git a/splunklib/searchcommands/search_command.py b/splunklib/searchcommands/search_command.py index 7e8f771e..e66f70c3 100644 --- a/splunklib/searchcommands/search_command.py +++ b/splunklib/searchcommands/search_command.py @@ -34,11 +34,8 @@ from urllib.parse import urlsplit from warnings import warn from xml.etree import ElementTree -from splunklib.utils import ensure_str - # Relative imports -import splunklib from . import Boolean, Option, environment from .internals import ( CommandLineParser, @@ -53,6 +50,7 @@ RecordWriterV2, json_encode_string) from ..client import Service +from ..utils import ensure_str # ----------------------------------------------------------------------------------------------------------------------