[gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/packages/

[Slava Bacherikov]

commit:     4f431675ab386384e49b5187a6a81b373aa8f255
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Sun Jun  3 14:55:02 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Sun Jun  3 14:55:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=4f431675

Refactoring in managers.

---
 gpackages/apps/packages/managers.py |   53 +++++++++++++++++------------------
 1 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/gpackages/apps/packages/managers.py b/gpackages/apps/packages/managers.py
index f613df2..d7caaf1 100644
--- a/gpackages/apps/packages/managers.py
+++ b/gpackages/apps/packages/managers.py
@@ -10,7 +10,19 @@ def _gen_query_and_manager(MixinClass, QueryClassName, ManagerClassName):
         })
     return QueryClass, ManagerClass
 
-class PackageMixin(object):
+def _gen_all_query_and_manager(mixin_name, name_for_query, name_for_manager, *args):
+    for arg in args:
+        basename = arg.__name__
+        if basename.endswith(mixin_name):
+            end_index = len(basename) - len(mixin_name)
+            basename = basename[ : end_index]
+        q_name = basename + name_for_query
+        m_name = basename + name_for_manager
+        q, m = _gen_query_and_manager(arg, q_name, m_name)
+        globals()[q_name], globals()[m_name] = q, m
+        
+
+class PackageMixin(object):#{{{
     def get(self, package = None, *args, **kwargs):
         if package is not None and isinstance(package, Package):
             if 'category' not in kwargs:
@@ -22,13 +34,10 @@ class PackageMixin(object):
                 args[1] = category
             else:
                 kwargs.update({'name': name})
-        return super(PackageMixin, self).get(*args, **kwargs)
+        return super(PackageMixin, self).get(*args, **kwargs)#}}}
 
-PackageQuerySet, PackageManager = _gen_query_and_manager(PackageMixin, 
-                                                        'PackageQuerySet',
-                                                        'PackageManager')
 
-class KeywordMixin(object):
+class KeywordMixin(object):#{{{
     def get_or_create(self, keyword=None,  **kwargs):
         if keyword is not None:
             if isinstance(keyword, Keyword):
@@ -37,13 +46,10 @@ class KeywordMixin(object):
             else:
                 raise ValueError("Bad keyword object")
 
-        return super(KeywordMixin, self).get_or_create(**kwargs)
+        return super(KeywordMixin, self).get_or_create(**kwargs)#}}}
 
-KeywordQuerySet, KeywordManager = _gen_query_and_manager(KeywordMixin, 
-                                                        'KeywordQuerySet',
-                                                        'KeywordManager')
 
-class EbuildMixin(object):
+class EbuildMixin(object):#{{{
     def create(self, **kwargs):
         if 'ebuild' in kwargs:
             obj = self.model(**kwargs)
@@ -94,34 +100,27 @@ class EbuildMixin(object):
             revision = ebuild.revision
             kwargs.update({ 'version': version,
                             'revision': revision })
-        return super(EbuildMixin, self).get(*args, **kwargs)
-            
-
+        return super(EbuildMixin, self).get(*args, **kwargs)#}}}
 
-EbuildQuerySet, EbuildManager =   _gen_query_and_manager(EbuildMixin,
-                                                        'EbuildQuerySet',
-                                                        'EbuildManager')
 
-class HerdsMixin(object):
+class HerdsMixin(object):#{{{
     def filter(self, *args, **kwargs):
         if 'herd__in' in kwargs:
             herds = kwargs['herd__in']
             del kwargs['herd__in']
             kwargs['name__in'] = herds
-        return super(HerdsMixin, self).filter(*args, **kwargs)
+        return super(HerdsMixin, self).filter(*args, **kwargs)#}}}
 
-HerdsQuerySet, HerdsManager = _gen_query_and_manager(HerdsMixin,
-                                                     'HerdsQuerySet',
-                                                     'HerdsManager')
 
-class MaintainerMixin(object):
+class MaintainerMixin(object):#{{{
     def filter(self, *args, **kwargs):
         if 'maintainer__in'  in kwargs:
             maintars = kwargs['maintainer__in']
             del kwargs['maintainer__in']
             kwargs['email__in'] = maintars
-        return super(MaintainerMixin, self).filter(*args, **kwargs)
+        return super(MaintainerMixin, self).filter(*args, **kwargs)#}}}
+
 
-MaintainerQuerySet, MaintainerManager = _gen_query_and_manager(MaintainerMixin,
-                                                     'MaintainerQuerySet',
-                                                     'MaintainerManager')
+_gen_all_query_and_manager('Mixin', 'QuerySet', 'Manager',
+                           PackageMixin, KeywordMixin, EbuildMixin, HerdsMixin,
+                           MaintainerMixin)