py3 ok relative imports

kinverarity1 · Feb 15, 2016 · 5db8337 · 5db8337
1 parent 1082dd8
commit 5db8337
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 23 deletions.
diff --git a/lasio/__init__.py b/lasio/__init__.py
@@ -1,6 +1,6 @@
-from las import LASFile, JSONEncoder
-from las_items import CurveItem, HeaderItem, SectionItems
-from reader import open_file
+from .las import LASFile, JSONEncoder
+from .las_items import CurveItem, HeaderItem, SectionItems
+from .reader import open_file
 
 try:
     import openpyxl

diff --git a/lasio/defaults.py b/lasio/defaults.py
@@ -1,7 +1,7 @@
 
 import numpy as np
 
-from las_items import (
+from .las_items import (
     HeaderItem, CurveItem, SectionItems, OrderedDict
 )
 

diff --git a/lasio/las.py b/lasio/las.py
@@ -38,12 +38,12 @@
 
 # internal lasio imports
 
-import exceptions
-from las_items import (
+from . import exceptions
+from .las_items import (
     HeaderItem, CurveItem, SectionItems, OrderedDict)
-import defaults
-import reader
-import writer
+from . import defaults
+from . import reader
+from . import writer
 
 logger = logging.getLogger(__name__)
 

diff --git a/lasio/reader.py b/lasio/reader.py
@@ -28,9 +28,9 @@
 else:
     from StringIO import StringIO
 
-import defaults
-import exceptions
-from las_items import HeaderItem, CurveItem, SectionItems, OrderedDict
+from . import defaults
+from . import exceptions
+from .las_items import HeaderItem, CurveItem, SectionItems, OrderedDict
 
 logger = logging.getLogger(__name__)
 
@@ -140,9 +140,10 @@ def read_section(self, section_name):
             try:
                 values = read_line(line)
             except:
-                raise exceptions.LASHeaderError('Failed in %s section on line:\n%s%s' % (
-                    section_name, line,
-                    traceback.format_exc().splitlines()[-1]))
+                raise exceptions.LASHeaderError(
+                    'Failed in %s section on line:\n%s%s' % (
+                        section_name, line,
+                        traceback.format_exc().splitlines()[-1]))
             else:
                 section.append(parser(**values))
         return section
@@ -161,8 +162,9 @@ def read_data(self, number_of_curves=None, null_subs=True):
             try:
                 arr = np.loadtxt(StringIO(s))
             except:
-                raise exceptions.LASDataError('Failed to read wrapped data: %s' % (
-                    traceback.format_exc().splitlines()[-1]))
+                raise exceptions.LASDataError(
+                    'Failed to read wrapped data: %s' % (
+                        traceback.format_exc().splitlines()[-1]))
             logger.debug('Reader.read_data arr shape = %s' % (arr.shape))
             logger.debug('Reader.read_data number of curves = %s' %
                          number_of_curves)

diff --git a/lasio/writer.py b/lasio/writer.py
@@ -3,15 +3,16 @@
 
 import numpy as np
 
-from las_items import (
+from .las_items import (
     HeaderItem, CurveItem, SectionItems, OrderedDict)
-import defaults
-import exceptions
+from . import defaults
+from . import exceptions
 
 logger = logging.getLogger(__name__)
 
 
-def write(las, file_object, version=None, wrap=None, STRT=None, STOP=None, STEP=None, fmt='%10.5g'):
+def write(las, file_object, version=None, wrap=None, STRT=None,
+          STOP=None, STEP=None, fmt='%10.5g'):
     if wrap is None:
         wrap = las.version['WRAP'] == 'YES'
     elif wrap is True:
@@ -224,7 +225,8 @@ def get_section_order_function(section, version,
     return lambda mnemonic: orders.get(mnemonic, default_order)
 
 
-def get_section_widths(section_name, items, version, order_func, middle_padding=5):
+def get_section_widths(section_name, items, version, order_func,
+                       middle_padding=5):
     '''Find minimum section widths fitting the content in *items*.
 
     Arguments:
@@ -245,7 +247,8 @@ def get_section_widths(section_name, items, version, order_func, middle_padding=
             order = order_func(i.mnemonic)
             rhs_element = order.split(':')[0]
             logger.debug(
-                'get_section_widths %s\n\torder=%s rhs_element=%s' % (i, order, rhs_element))
+                'get_section_widths %s\n\torder=%s rhs_element=%s' % (
+                    i, order, rhs_element))
             middle_widths.append(
                 len(str(i.unit)) + 1 + len(str(i[rhs_element])))
         section_widths['middle_width'] = max(middle_widths)