From: Chris Withers <chris@simplistix.co.uk>
Date: Fri, 9 Apr 2010 18:02:08 +0000 (+0100)
Subject: no need for this to be a function
X-Git-Tag: rel_0_6_0~23^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=771da053d909633de7f4e0d87ca557ec43469f70;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

no need for this to be a function
---

diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py
index 94dba77fae..552fc2c17f 100644
--- a/lib/sqlalchemy/ext/declarative.py
+++ b/lib/sqlalchemy/ext/declarative.py
@@ -539,11 +539,8 @@ def _as_declarative(cls, classname, dict_):
     mapper_args = {}
     table_args = None
     
-    def _is_mixin(klass):
-        return not _is_mapped_class(klass) and klass is not cls
-    
     for base in cls.__mro__:
-        if _is_mixin(base):
+        if not _is_mapped_class(base) and base is not cls:
             for name in dir(base):
                 if name == '__mapper_args__':
                     if not mapper_args: