From fd03e66083d8343e6d876294ff876ca9d1bb2255 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 13 Mar 2017 15:58:32 +0100 Subject: [PATCH] Modified import of own modules --- pp_lib/mailaddress.py | 13 ++++++++++--- pp_lib/obj.py | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/pp_lib/mailaddress.py b/pp_lib/mailaddress.py index 09b5090..b49942a 100644 --- a/pp_lib/mailaddress.py +++ b/pp_lib/mailaddress.py @@ -6,6 +6,7 @@ @copyright: © 2010 - 2016 by Frank Brehm, ProfitBricks GmbH, Berlin @summary: The module for the MailAddress object. """ +from __future__ import absolute_import # Standard modules import sys @@ -14,9 +15,15 @@ import logging import re # Own modules -from pp_lib.errors import InvalidMailAddressError - -from pp_lib.common import to_str +try: + from .errors import InvalidMailAddressError +except (SystemError, ImportError): + from errors import InvalidMailAddressError + +try: + from .common import to_str +except (SystemError, ImportError): + from common import to_str __version__ = '0.2.2' log = logging.getLogger(__name__) diff --git a/pp_lib/obj.py b/pp_lib/obj.py index 7da42a9..ffd59dc 100644 --- a/pp_lib/obj.py +++ b/pp_lib/obj.py @@ -5,6 +5,7 @@ @contact: frank.brehm@pixelpark.com @copyright: © 2010 - 2017 by Frank Brehm, Publicies Pixelpark GmbH, Berlin """ +from __future__ import absolute_import # Standard modules import sys @@ -17,9 +18,15 @@ import traceback import six # Own modules -from pp_tools import pp - -from pp_tools.errors import PpError +try: + from .common import pp +except (SystemError, ImportError): + from common import pp + +try: + from .errors import PpError +except (SystemError, ImportError): + from errors import PpError __version__ = '0.1.1' -- 2.39.5