]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
fix __init__ in the metaclass
authorMike Bayer <mike_mp@zzzcomputing.com>
Thu, 4 Oct 2012 14:32:51 +0000 (10:32 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Thu, 4 Oct 2012 14:32:51 +0000 (10:32 -0400)
lib/sqlalchemy/ext/declarative.py

index b117a570a11359299491269c5f85e1905863be44..f01f3fc61b73052d9dce8b564c71d14978b19b83 100755 (executable)
@@ -1337,11 +1337,9 @@ def _as_declarative(cls, classname, dict_):
 
 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__: