From: Chris Withers <chris@simplistix.co.uk>
Date: Tue, 13 Apr 2010 00:27:24 +0000 (+0100)
Subject: remove tortology
X-Git-Tag: rel_0_6_0~23^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7dc1b631f30dbf4fb109f899f699ee61f868cc73;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

remove tortology
---

diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py
index 4fda6c896b..de2cbe5736 100755
--- a/lib/sqlalchemy/ext/declarative.py
+++ b/lib/sqlalchemy/ext/declarative.py
@@ -550,11 +550,11 @@ def _as_declarative(cls, classname, dict_):
                     if not mapper_args:
                         mapper_args = cls.__mapper_args__
                 elif propagate:
-                    if name == '__table_args__' and propagate:
+                    if name == '__table_args__':
                         if not table_args:
                             table_args = cls.__table_args__
                     elif name == '__tablename__':
-                        if not tablename and propagate:
+                        if not tablename:
                             tablename = cls.__tablename__
                     elif base is not cls:
                         if isinstance(obj, Column):