Commits

Mike Bayer committed 0fde73f

fix __init__ in the metaclass

  • Participants
  • Parent commits 4871cf1
  • Branches rel_0_7

Comments (0)

Files changed (1)

lib/sqlalchemy/ext/declarative.py

 
 class DeclarativeMeta(type):
     def __init__(cls, classname, bases, dict_):
-        if '_decl_class_registry' in cls.__dict__:
-            return type.__init__(cls, classname, bases, dict_)
-        else:
+        if '_decl_class_registry' not in cls.__dict__:
             _as_declarative(cls, classname, cls.__dict__)
-        return type.__init__(cls, classname, bases, dict_)
+        type.__init__(cls, classname, bases, dict_)
 
     def __setattr__(cls, key, value):
         if '__mapper__' in cls.__dict__: