Author: phd
Date: 2006-10-27 14:19:28 -0600 (Fri, 27 Oct 2006)
New Revision: 2044
Modified:
home/phd/SQLObject/paramstyles/sqlobject/main.py
Log:
Merged patches from the revisions 2042:2043 from the trunk
Modified: home/phd/SQLObject/paramstyles/sqlobject/main.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/main.py 2006-10-27 20:18:25 UTC (rev 2043)
+++ home/phd/SQLObject/paramstyles/sqlobject/main.py 2006-10-27 20:19:28 UTC (rev 2044)
@@ -325,8 +325,8 @@
for base in soClass.__bases__:
if hasattr(base, "sqlmeta"):
parent_columns.extend(base.sqlmeta.columns.keys())
- if name in dir(soClass):
- assert name in parent_columns or name == "childName", (
+ if hasattr(soClass, name):
+ assert (name in parent_columns) or (name == "childName"), (
"The class %s.%s already has a variable or method %r, you cannot "
"add the column %r"
% (soClass.__module__, soClass.__name__, name, name))
|
