From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 4 Oct 2012 14:32:51 +0000 (-0400)
Subject: fix __init__ in the metaclass
X-Git-Tag: rel_0_7_10~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23cad2a54980178dbefbc2c85ef7ec6b73e0499f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix __init__ in the metaclass
---

diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py
index b117a570a1..f01f3fc61b 100755
--- a/lib/sqlalchemy/ext/declarative.py
+++ b/lib/sqlalchemy/ext/declarative.py
@@ -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__: