Merge pull request #167 from splunk/feature/relative-imports

Import module relatively

Author: shakeelmohamed

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",

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",

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
+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

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

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

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

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):

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

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

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