[SQL-CVS] r582 - trunk/SQLObject/sqlobject

[<sub...@co...>]

Author: ianb
Date: 2005-02-09 05:27:03 +0000 (Wed, 09 Feb 2005)
New Revision: 582

Modified:
   trunk/SQLObject/sqlobject/declarative.py
Log:
Move the counting part into the class and out of the metaclass


Modified: trunk/SQLObject/sqlobject/declarative.py
===================================================================
--- trunk/SQLObject/sqlobject/declarative.py	2005-02-09 05:18:31 UTC (rev 581)
+++ trunk/SQLObject/sqlobject/declarative.py	2005-02-09 05:27:03 UTC (rev 582)
@@ -91,7 +91,6 @@
         cls = type.__new__(meta, class_name, bases, new_attrs)
         if new_attrs.has_key('__classinit__'):
             cls.__classinit__ = staticmethod(cls.__classinit__.im_func)
-        cls.declarative_count = counter.next()
         cls.__classinit__(cls, new_attrs)
         return cls
 
@@ -104,6 +103,7 @@
     __metaclass__ = DeclarativeMeta
 
     def __classinit__(cls, new_attrs):
+        cls.declarative_count = counter.next()
         for name in cls.__mutableattributes__:
             if not new_attrs.has_key(name):
                 setattr(cls, copy.copy(getattr(cls, name)))