[SQL-CVS] r4135 - in SQLObject/trunk: docs sqlobject/manager

[<sub...@co...>]

Author: phd
Date: 2010-03-17 11:56:30 -0600 (Wed, 17 Mar 2010)
New Revision: 4135

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/manager/command.py
Log:
Better handling of circular dependencies in sqlobject-admin -
do not include the class in the list of other classes.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2010-03-17 17:50:26 UTC (rev 4134)
+++ SQLObject/trunk/docs/News.txt	2010-03-17 17:56:30 UTC (rev 4135)
@@ -32,6 +32,9 @@
 * Validators became stricter: StringCol and UnicodeCol now accept only str
   or unicode, BoolCol accepts only bool or int, and so on.
 
+* Better handling of circular dependencies in sqlobject-admin -
+  do not include the class in the list of other classes.
+
 SQLObject 0.12.2
 ================
 

Modified: SQLObject/trunk/sqlobject/manager/command.py
===================================================================
--- SQLObject/trunk/sqlobject/manager/command.py	2010-03-17 17:50:26 UTC (rev 4134)
+++ SQLObject/trunk/sqlobject/manager/command.py	2010-03-17 17:56:30 UTC (rev 4135)
@@ -208,7 +208,7 @@
                 if col.foreignKey:
                     other = findClass(col.foreignKey,
                                       col.soClass.sqlmeta.registry)
-                    if other not in depended:
+                    if (other is not cls) and (other not in depended):
                         depended.append(other)
             return depended