remove lazy_import

pyupdater/__init__.py

@@ -22,51 +22,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
 # OR OTHER DEALINGS IN THE SOFTWARE.
 # --------------------------------------------------------------------------
-from pyupdater.utils import lazy_import
-
-__all__ = ['PyUpdater']
-
-
-@lazy_import
-def pyupdater():
-    import pyupdater.core
-    import pyupdater.settings
-    return pyupdater
-
-
-@lazy_import
-def logging():
-    import logging
-    import logging.handlers
-    return logging
-
-
-@lazy_import
-def os():
-    import os
-    return os
+import logging
 
+from pyupdater.core import PyUpdater
 
-@lazy_import
-def sys():
-    import sys
-    return sys
-
-
-@lazy_import
-def appdirs():
-    import appdirs
-    return appdirs
-
-
-@lazy_import
-def dsdev_utils():
-    import dsdev_utils
-    import dsdev_utils.logger
-    return dsdev_utils
-
-
-PyUpdater = pyupdater.core.PyUpdater
+__all__ = ['PyUpdater']
 
 
 log = logging.getLogger()

pyupdater/cli/__init__.py

@@ -27,6 +27,7 @@
 import io
 import json
 import logging
+from logging.handlers import RotatingFileHandler
 import os
 import sys
 
@@ -81,8 +82,7 @@
     os.makedirs(LOG_DIR)
 
 log_file = os.path.join(LOG_DIR, settings.LOG_FILENAME_DEBUG)
-rfh = logging.handlers.RotatingFileHandler(log_file, maxBytes=1048576,
-                                           backupCount=2)
+rfh = RotatingFileHandler(log_file, maxBytes=1048576, backupCount=2)
 rfh.setFormatter(logging_formatter)
 rfh.setLevel(logging.DEBUG)
 log.addHandler(rfh)

pyupdater/client/patcher.py

@@ -30,25 +30,17 @@
 import bsdiff4
 
 from dsdev_utils.crypto import get_package_hashes
-from dsdev_utils.helpers import EasyAccessDict, lazy_import, Version
-from dsdev_utils.paths import remove_any
+from dsdev_utils.helpers import EasyAccessDict, Version
+from dsdev_utils.paths import ChDir, remove_any
+from dsdev_utils.system import get_system
 
 from pyupdater.client.downloader import FileDownloader
 from pyupdater import settings
 from pyupdater.utils.exceptions import PatcherError
 
 log = logging.getLogger(__name__)
 
-
-@lazy_import
-def dsdev_utils():
-    import dsdev_utils
-    import dsdev_utils.paths
-    import dsdev_utils.system
-    return dsdev_utils
-
-
-_PLATFORM = dsdev_utils.system.get_system()
+_PLATFORM = get_system()
 
 
 class Patcher(object):
@@ -152,7 +144,7 @@ def _verify_installed_binary(self):
         log.debug('Checking for current installed binary to patch')
         status = True
 
-        with dsdev_utils.paths.ChDir(self.update_folder):
+        with ChDir(self.update_folder):
             if not os.path.exists(self.current_filename):
                 log.debug('Cannot find archive to patch')
                 status = False
@@ -349,7 +341,7 @@ def _write_update_to_disk(self):  # pragma: no cover
         if filename is None:
             raise PatcherError('Filename missing in version file')
 
-        with dsdev_utils.paths.ChDir(self.update_folder):
+        with ChDir(self.update_folder):
             try:
                 with open(filename, 'wb') as f:
                     f.write(self.og_binary)

pyupdater/key_handler/__init__.py

@@ -25,53 +25,17 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+import gzip
+import json
+import logging
+import os
+import ed25519
+import six
+
 from pyupdater import settings
-from pyupdater.utils import lazy_import
 from pyupdater.utils.storage import Storage
 
 
-@lazy_import
-def gzip():
-    import gzip
-    return gzip
-
-
-@lazy_import
-def json():
-    import json
-    return json
-
-
-@lazy_import
-def logging():
-    import logging
-    return logging
-
-
-@lazy_import
-def os():
-    import os
-    return os
-
-
-@lazy_import
-def shutil():
-    import shutil
-    return shutil
-
-
-@lazy_import
-def ed25519():
-    import ed25519
-    return ed25519
-
-
-@lazy_import
-def six():
-    import six
-    return six
-
-
 log = logging.getLogger(__name__)