Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use class_regid / classid functions
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Fri, 14 Aug 2009 14:23:06 +0200
changeset 2844 4657d6e16e0c
parent 2843 3f5194ef620d
child 2846 e71d6a585b83
use class_regid / classid functions
vregistry.py file | annotate | diff | comparison | revisions 
--- a/vregistry.py	Fri Aug 14 11:44:19 2009 +0200
+++ b/vregistry.py	Fri Aug 14 14:23:06 2009 +0200
@@ -314,8 +314,8 @@
         except AttributeError:
             vname = obj.__class__.__name__
         self.debug('registered appobject %s in registry %s with id %s',
-                   vname, registryname, oid or obj.id)
-        self._loadedmods[obj.__module__]['%s.%s' % (obj.__module__, oid)] = obj
+                   vname, registryname, oid or class_regid(obj))
+        self._loadedmods[obj.__module__][classid(obj)] = obj
 
     def unregister(self, obj, registryname=None):
         self[registryname or obj.__registry__].unregister(obj)
@@ -404,10 +404,10 @@
                 return
         except TypeError:
             return
-        objname = '%s.%s' % (modname, obj.__name__)
-        if objname in self._loadedmods[modname]:
+        clsid = classid(obj)
+        if clsid in self._loadedmods[modname]:
             return
-        self._loadedmods[modname][objname] = obj
+        self._loadedmods[modname][clsid] = obj
         for parent in obj.__bases__:
             self._load_ancestors_then_object(modname, parent)
         self.load_object(obj)
cubicweb