diff --git a/splunklib/binding.py b/splunklib/binding.py index 8fb86e78b..94c1126b9 100644 --- a/splunklib/binding.py +++ b/splunklib/binding.py @@ -46,7 +46,7 @@ except ImportError, e: from xml.parsers.expat import ExpatError as ParseError -from data import record +from .data import record __all__ = [ "AuthenticationError", diff --git a/splunklib/client.py b/splunklib/client.py index 2acd5d3bf..c10f14fb5 100644 --- a/splunklib/client.py +++ b/splunklib/client.py @@ -67,9 +67,9 @@ import socket import contextlib -from binding import Context, HTTPError, AuthenticationError, namespace, UrlEncoded, _encode, _make_cookie_header, _NoAuthenticationToken -from data import record -import data +from .binding import Context, HTTPError, AuthenticationError, namespace, UrlEncoded, _encode, _make_cookie_header, _NoAuthenticationToken +from .data import record +from . import data __all__ = [ "connect", diff --git a/splunklib/modularinput/__init__.py b/splunklib/modularinput/__init__.py index 503342c9c..ace954a02 100755 --- a/splunklib/modularinput/__init__.py +++ b/splunklib/modularinput/__init__.py @@ -3,10 +3,10 @@ from splunklib.modularinput import * """ -from argument import Argument -from event import Event -from event_writer import EventWriter -from input_definition import InputDefinition -from scheme import Scheme -from script import Script -from validation_definition import ValidationDefinition \ No newline at end of file +from .argument import Argument +from .event import Event +from .event_writer import EventWriter +from .input_definition import InputDefinition +from .scheme import Scheme +from .script import Script +from .validation_definition import ValidationDefinition diff --git a/splunklib/modularinput/event_writer.py b/splunklib/modularinput/event_writer.py index 336e41bd2..418405fce 100755 --- a/splunklib/modularinput/event_writer.py +++ b/splunklib/modularinput/event_writer.py @@ -14,7 +14,7 @@ import sys -from splunklib.modularinput.event import ET +from .event import ET try: from cStringIO import StringIO diff --git a/splunklib/modularinput/input_definition.py b/splunklib/modularinput/input_definition.py index 28f3d169b..3a2e1faef 100755 --- a/splunklib/modularinput/input_definition.py +++ b/splunklib/modularinput/input_definition.py @@ -17,7 +17,7 @@ except ImportError as ie: import xml.etree.ElementTree as ET -from utils import parse_xml_data +from .utils import parse_xml_data class InputDefinition: """``InputDefinition`` encodes the XML defining inputs that Splunk passes to diff --git a/splunklib/modularinput/script.py b/splunklib/modularinput/script.py index d35f0c431..dddca8ad7 100755 --- a/splunklib/modularinput/script.py +++ b/splunklib/modularinput/script.py @@ -16,10 +16,10 @@ from urlparse import urlsplit import sys -from splunklib.client import Service -from splunklib.modularinput.event_writer import EventWriter -from splunklib.modularinput.input_definition import InputDefinition -from splunklib.modularinput.validation_definition import ValidationDefinition +from ..client import Service +from .event_writer import EventWriter +from .input_definition import InputDefinition +from .validation_definition import ValidationDefinition try: import xml.etree.cElementTree as ET diff --git a/splunklib/modularinput/validation_definition.py b/splunklib/modularinput/validation_definition.py index 49aff5b64..72f8e7bec 100755 --- a/splunklib/modularinput/validation_definition.py +++ b/splunklib/modularinput/validation_definition.py @@ -18,7 +18,7 @@ except ImportError as ie: import xml.etree.ElementTree as ET -from utils import parse_xml_data +from .utils import parse_xml_data class ValidationDefinition(object): diff --git a/splunklib/results.py b/splunklib/results.py index 082bacbdc..ffc9b0bee 100644 --- a/splunklib/results.py +++ b/splunklib/results.py @@ -40,7 +40,7 @@ try: from collections import OrderedDict # must be python 2.7 except ImportError: - from splunklib.ordereddict import OrderedDict + from .ordereddict import OrderedDict try: from cStringIO import StringIO diff --git a/splunklib/searchcommands/decorators.py b/splunklib/searchcommands/decorators.py index db56e6f42..1a0400fc5 100644 --- a/splunklib/searchcommands/decorators.py +++ b/splunklib/searchcommands/decorators.py @@ -19,7 +19,7 @@ try: from collections import OrderedDict # must be python 2.7 except ImportError: - from splunklib.ordereddict import OrderedDict + from ..ordereddict import OrderedDict from inspect import getmembers, isclass, isfunction from itertools import imap diff --git a/splunklib/searchcommands/internals.py b/splunklib/searchcommands/internals.py index 48760a63a..be57703eb 100644 --- a/splunklib/searchcommands/internals.py +++ b/splunklib/searchcommands/internals.py @@ -20,7 +20,7 @@ try: from collections import OrderedDict # must be python 2.7 except ImportError: - from splunklib.ordereddict import OrderedDict + from ..ordereddict import OrderedDict from cStringIO import StringIO from itertools import chain, imap from json import JSONDecoder, JSONEncoder diff --git a/splunklib/searchcommands/search_command.py b/splunklib/searchcommands/search_command.py index 7ed0d5206..2f6cb086b 100644 --- a/splunklib/searchcommands/search_command.py +++ b/splunklib/searchcommands/search_command.py @@ -18,14 +18,11 @@ # Absolute imports -from splunklib.client import Service - - from collections import namedtuple try: from collections import OrderedDict # must be python 2.7 except ImportError: - from splunklib.ordereddict import OrderedDict + from ..ordereddict import OrderedDict from copy import deepcopy from cStringIO import StringIO from itertools import chain, ifilter, imap, islice, izip @@ -64,6 +61,7 @@ json_encode_string) from . import Boolean, Option, environment +from ..client import Service # ----------------------------------------------------------------------------------------------------------------------