Strict usage of absolute and relative imports

diff --git a/format-du.py b/format-du.py
index 42d656f7020898672ef3276cf78ad76615741c94..8446382e086119373356ed02ffefdb1c81098117 100755 (executable)
--- a/format-du.py
+++ b/format-du.py
@@ -18,6 +18,8 @@ from pp_lib.common import pp
 
 from pp_lib.app import PpApplication
 
+import pp_lib.format_du
+
 log = logging.getLogger(__name__)
 
 __author__ = 'Frank Brehm <frank.brehm@pixelpark.com>'

diff --git a/pp_lib/app.py b/pp_lib/app.py
index 00767a2cc257388b0172a9c0c2ce505a2dbaeff8..5c42c0c4ecda5ad5b41cac53fcfe6dcacdbba1fe 100644 (file)
--- a/pp_lib/app.py
+++ b/pp_lib/app.py
@@ -23,32 +23,17 @@ import six
 import argparse
 
 # Own modules
-try:
-    from .global_version import __version__ as __global_version__
-except (SystemError, ImportError):
-    from global_version import __version__ as __global_version__
-
-try:
-    from .errors import FunctionNotImplementedError, PpAppError
-except (SystemError, ImportError):
-    from errors import FunctionNotImplementedError, PpAppError
-
-try:
-    from .common import pp, terminal_can_colors, to_bytes
-except (SystemError, ImportError):
-    from common import pp, terminal_can_colors, to_bytes
-
-try:
-    from .colored import ColoredFormatter, colorstr
-except (SystemError, ImportError):
-    from colored import ColoredFormatter, colorstr
-
-try:
-    from .obj import PpBaseObjectError, PpBaseObject
-except (SystemError, ImportError):
-    from obj import PpBaseObjectError, PpBaseObject
-
-__version__ = '0.1.0'
+from .global_version import __version__ as __global_version__
+
+from .errors import FunctionNotImplementedError, PpAppError
+
+from .common import pp, terminal_can_colors, to_bytes
+
+from .colored import ColoredFormatter, colorstr
+
+from .obj import PpBaseObjectError, PpBaseObject
+
+__version__ = '0.2.1'
 LOG = logging.getLogger(__name__)
 
 

diff --git a/pp_lib/mailaddress.py b/pp_lib/mailaddress.py
index b49942ab2b3f97626793e4178d3f2cdcc9d3d3a6..f0e6d37608f178f2c0bcecd04dc36c0f33e47641 100644 (file)
--- a/pp_lib/mailaddress.py
+++ b/pp_lib/mailaddress.py
@@ -15,17 +15,11 @@ import logging
 import re
 
 # Own modules
-try:
-    from .errors import InvalidMailAddressError
-except (SystemError, ImportError):
-    from errors import InvalidMailAddressError
+from .errors import InvalidMailAddressError
 
-try:
-    from .common import to_str
-except (SystemError, ImportError):
-    from common import to_str
+from .common import to_str
 
-__version__ = '0.2.2'
+__version__ = '0.3.1'
 log = logging.getLogger(__name__)
 
 

diff --git a/pp_lib/obj.py b/pp_lib/obj.py
index dc264efdcceb983a9043ab4041c3da56ee44e3bf..7cf689876d89e7e91563992eceb8b06de4b966f5 100644 (file)
--- a/pp_lib/obj.py
+++ b/pp_lib/obj.py
@@ -18,18 +18,12 @@ import traceback
 import six
 
 # Own modules
-try:
-    from .common import pp, to_bytes
-except (SystemError, ImportError):
-    from common import pp, to_bytes
+from .common import pp, to_bytes
 
-try:
-    from .errors import PpError
-except (SystemError, ImportError):
-    from errors import PpError
+from .errors import PpError
 
 
-__version__ = '0.1.1'
+__version__ = '0.2.1'
 
 LOG = logging.getLogger(__name__)