[gentoo-commits] proj/R_overlay:master commit in: roverlay/overlay/pkgdir/, roverlay/overlay/

[André Erdmann]

commit:     14fa2c10125834937c7c3db5f6495749b1d06d94
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug  2 13:30:12 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug  2 13:30:12 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=14fa2c10

manifest implementations: simplify code

* moved [overlay]/pkgdir/__init__ to pkgdir/base
* pkgdir/base no longer uses importlib, package dir modules/classes are used
  directly instead (_PACKAGE_DIR_IMPLEMENTATIONS lists PackageDir classes now)
* overlay/category sets its pkgdir class in __init__ now

---
 roverlay/overlay/__init__.py                      |  4 --
 roverlay/overlay/category.py                      | 15 ++--
 roverlay/overlay/creator.py                       |  2 +-
 roverlay/overlay/pkgdir/__init__.py               | 86 -----------------------
 roverlay/overlay/pkgdir/{__init__.py => base.py}  | 43 +++---------
 roverlay/overlay/pkgdir/packagedir_newmanifest.py |  4 +-
 6 files changed, 21 insertions(+), 133 deletions(-)

diff --git a/roverlay/overlay/__init__.py b/roverlay/overlay/__init__.py
index 84cdf31..708f8ae 100644
--- a/roverlay/overlay/__init__.py
+++ b/roverlay/overlay/__init__.py
@@ -5,7 +5,3 @@
 # either version 2 of the License, or (at your option) any later version.
 
 """overlay package"""
-
-__all__ = [ 'Overlay', ]
-
-from roverlay.overlay.root import Overlay

diff --git a/roverlay/overlay/category.py b/roverlay/overlay/category.py
index 751a26d..2fc3a4f 100644
--- a/roverlay/overlay/category.py
+++ b/roverlay/overlay/category.py
@@ -26,7 +26,10 @@ except ImportError:
 
 import roverlay.stats.collector
 
-from roverlay.overlay import pkgdir
+import roverlay.overlay.pkgdir.base
+##import roverlay.overlay.pkgdir.packagedir_ebuildmanifest
+##import roverlay.overlay.pkgdir.packagedir_newmanifest
+
 
 class WriteQueueJob ( object ):
 
@@ -100,6 +103,7 @@ class Category ( object ):
       self.physical_location   = directory
       self.get_header          = get_header
       self.runtime_incremental = runtime_incremental
+      self.packagedir_cls      = roverlay.overlay.pkgdir.base.get_class()
    # --- end of __init__ (...) ---
 
    def _get_package_dir ( self, pkg_name ):
@@ -113,7 +117,7 @@ class Category ( object ):
          self._lock.acquire()
          try:
             if not pkg_name in self._subdirs:
-               newpkg = pkgdir.get_class() (
+               newpkg = self.packagedir_cls (
                   name        = pkg_name,
                   logger      = self.logger,
                   directory   = self.physical_location + os.sep + pkg_name,
@@ -249,12 +253,7 @@ class Category ( object ):
 
       """
       if unsafe:
-         try:
-            return bool (
-               next ( iter ( self._subdirs.values() ) ).MANIFEST_THREADSAFE
-            )
-         except StopIteration:
-            return True
+         return self.packagedir_cls.MANIFEST_THREADSAFE
       else:
          for pkgdir in self._subdirs.values():
             #if not pkgdir.__class__.MANIFEST_THREADSAFE:

diff --git a/roverlay/overlay/creator.py b/roverlay/overlay/creator.py
index 32dacbc..96c5531 100644
--- a/roverlay/overlay/creator.py
+++ b/roverlay/overlay/creator.py
@@ -26,7 +26,7 @@ except ImportError:
 
 from roverlay                    import config, errorqueue
 
-from roverlay.overlay            import Overlay
+from roverlay.overlay.root       import Overlay
 from roverlay.overlay.worker     import OverlayWorker
 from roverlay.packageinfo        import PackageInfo
 from roverlay.packagerules.rules import PackageRules

diff --git a/roverlay/overlay/pkgdir/__init__.py b/roverlay/overlay/pkgdir/__init__.py
index 90dfb6e..e69de29 100644
--- a/roverlay/overlay/pkgdir/__init__.py
+++ b/roverlay/overlay/pkgdir/__init__.py
@@ -1,86 +0,0 @@
-# R overlay -- overlay package, package directory
-# -*- coding: utf-8 -*-
-# Copyright (C) 2012 André Erdmann <dywi@×××××××.de>
-# Distributed under the terms of the GNU General Public License;
-# either version 2 of the License, or (at your option) any later version.
-
-__all__ = [ 'create', 'get_class', ]
-
-# the actual PackageDir implementation will be loaded after initialization
-# of the config module (using importlib.import_module)
-import importlib
-
-import logging
-
-import roverlay.config
-
-
-# _package_dir_module is an imported module or None
-_package_dir_module = None
-_package_dir_class  = None
-
-_PACKAGE_DIR_IMPLEMENTATIONS = {
-   'none'    : 'packagedir_base',
-   'default' : 'packagedir_newmanifest',
-   'e'       : 'packagedir_ebuildmanifest',
-   'ebuild'  : 'packagedir_ebuildmanifest',
-   'next'    : 'packagedir_newmanifest',
-}
-
-def _configure():
-   """Determines which Manifest implementation to use and sets the
-   _package_dir_module, _package_dir_class variables accordingly.
-   """
-
-   mf_impl = roverlay.config.get_or_fail ( 'OVERLAY.manifest_implementation' )
-
-   # also accept the internal (module) name of the manifest implementation
-   pkgdir_impl = (
-      _PACKAGE_DIR_IMPLEMENTATIONS.get ( mf_impl, None )
-      or (
-         mf_impl
-            if mf_impl in _PACKAGE_DIR_IMPLEMENTATIONS.values()
-         else None
-      )
-   )
-
-   if pkgdir_impl is not None:
-      global _package_dir_module
-      _package_dir_module = importlib.import_module (
-         'roverlay.overlay.pkgdir.' + pkgdir_impl
-      )
-
-      global _package_dir_class
-      if hasattr ( _package_dir_module, 'PackageDir' ):
-         _package_dir_class = _package_dir_module.PackageDir
-      else:
-         _package_dir_class = _package_dir_module.PackageDirBase
-
-      if hasattr ( _package_dir_class, 'init_cls' ):
-         _package_dir_class.init_cls()
-      else:
-         _package_dir_class.init_base_cls()
-
-      logging.getLogger ('pkgdir').debug (
-         'Using {!r} as manifest implementation.'.format ( mf_impl )
-      )
-   else:
-      # NameError, NotImplementedError, ...?
-      raise Exception (
-         "PackageDir/Manifest implementation {} is unknown".format ( mf_impl )
-      )
-# --- end of configure (...) ---
-
-def get_class():
-   """Returns the configured PackageDir class."""
-   if _package_dir_class is None:
-      _configure()
-   return _package_dir_class
-# --- end of get_class (...) ---
-
-def create ( *args, **kwargs ):
-   """Returns a new PackageDir object by calling the constructor
-   of the configured PackageDir class (as returned by get_class()).
-   """
-   return get_class() ( *args, **kwargs )
-# --- end of create (...) ---

diff --git a/roverlay/overlay/pkgdir/__init__.py b/roverlay/overlay/pkgdir/base.py
similarity index 59%
copy from roverlay/overlay/pkgdir/__init__.py
copy to roverlay/overlay/pkgdir/base.py
index 90dfb6e..4d48a3f 100644
--- a/roverlay/overlay/pkgdir/__init__.py
+++ b/roverlay/overlay/pkgdir/base.py
@@ -6,55 +6,34 @@
 
 __all__ = [ 'create', 'get_class', ]
 
-# the actual PackageDir implementation will be loaded after initialization
-# of the config module (using importlib.import_module)
-import importlib
-
 import logging
 
 import roverlay.config
 
+import roverlay.overlay.pkgdir.packagedir_base
+import roverlay.overlay.pkgdir.packagedir_ebuildmanifest
+import roverlay.overlay.pkgdir.packagedir_newmanifest
+
 
-# _package_dir_module is an imported module or None
-_package_dir_module = None
 _package_dir_class  = None
 
 _PACKAGE_DIR_IMPLEMENTATIONS = {
-   'none'    : 'packagedir_base',
-   'default' : 'packagedir_newmanifest',
-   'e'       : 'packagedir_ebuildmanifest',
-   'ebuild'  : 'packagedir_ebuildmanifest',
-   'next'    : 'packagedir_newmanifest',
+   'none'    : roverlay.overlay.pkgdir.packagedir_base.PackageDirBase,
+   'default' : roverlay.overlay.pkgdir.packagedir_newmanifest.PackageDir,
+   'e'       : roverlay.overlay.pkgdir.packagedir_ebuildmanifest.PackageDir,
+   'ebuild'  : roverlay.overlay.pkgdir.packagedir_ebuildmanifest.PackageDir,
+   'next'    : roverlay.overlay.pkgdir.packagedir_newmanifest.PackageDir,
 }
 
 def _configure():
    """Determines which Manifest implementation to use and sets the
    _package_dir_module, _package_dir_class variables accordingly.
    """
-
    mf_impl = roverlay.config.get_or_fail ( 'OVERLAY.manifest_implementation' )
 
-   # also accept the internal (module) name of the manifest implementation
-   pkgdir_impl = (
-      _PACKAGE_DIR_IMPLEMENTATIONS.get ( mf_impl, None )
-      or (
-         mf_impl
-            if mf_impl in _PACKAGE_DIR_IMPLEMENTATIONS.values()
-         else None
-      )
-   )
-
-   if pkgdir_impl is not None:
-      global _package_dir_module
-      _package_dir_module = importlib.import_module (
-         'roverlay.overlay.pkgdir.' + pkgdir_impl
-      )
-
+   if mf_impl in _PACKAGE_DIR_IMPLEMENTATIONS:
       global _package_dir_class
-      if hasattr ( _package_dir_module, 'PackageDir' ):
-         _package_dir_class = _package_dir_module.PackageDir
-      else:
-         _package_dir_class = _package_dir_module.PackageDirBase
+      _package_dir_class = _PACKAGE_DIR_IMPLEMENTATIONS [mf_impl]
 
       if hasattr ( _package_dir_class, 'init_cls' ):
          _package_dir_class.init_cls()

diff --git a/roverlay/overlay/pkgdir/packagedir_newmanifest.py b/roverlay/overlay/pkgdir/packagedir_newmanifest.py
index 7bbfb86..fb9bd2d 100644
--- a/roverlay/overlay/pkgdir/packagedir_newmanifest.py
+++ b/roverlay/overlay/pkgdir/packagedir_newmanifest.py
@@ -13,10 +13,10 @@ import threading
 import roverlay.config
 
 import roverlay.overlay.pkgdir.manifest.file
-import roverlay.overlay.pkgdir.packagedir_base
-
 from roverlay.overlay.pkgdir.manifest.file import ManifestFile
 
+import roverlay.overlay.pkgdir.packagedir_base
+
 
 class PackageDir ( roverlay.overlay.pkgdir.packagedir_base.PackageDirBase ):
    """