From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Tue, 14 Mar 2017 11:26:53 +0000 (+0100)
Subject: Strict usage of absolute and relative imports
X-Git-Tag: 0.1.2~270
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=877456ff13fefd243b14265cee9d1e2aa6dc9b21;p=pixelpark%2Fadmin-tools.git

Strict usage of absolute and relative imports
---

diff --git a/format-du.py b/format-du.py
index 42d656f..8446382 100755
--- 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 00767a2..5c42c0c 100644
--- 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 b49942a..f0e6d37 100644
--- 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 dc264ef..7cf6898 100644
--- 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__)