[SQL-CVS] r1451 - SQLObject/branches/0.7-bugfix/sqlobject

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

Author: phd
Date: 2006-01-03 11:42:17 +0000 (Tue, 03 Jan 2006)
New Revision: 1451

Modified:
   SQLObject/branches/0.7-bugfix/sqlobject/main.py
Log:
Merged a patch from the rev 1450: patch N 1356651 from the SF tracker.


Modified: SQLObject/branches/0.7-bugfix/sqlobject/main.py
===================================================================
--- SQLObject/branches/0.7-bugfix/sqlobject/main.py	2006-01-03 11:35:21 UTC (rev 1450)
+++ SQLObject/branches/0.7-bugfix/sqlobject/main.py	2006-01-03 11:42:17 UTC (rev 1451)
@@ -522,6 +522,10 @@
     def delJoin(sqlmeta, joinDef):
         soClass = sqlmeta.soClass
         for join in sqlmeta.joins:
+            # previously deleted joins will be None, so it must
+            # be skipped or it'll error out on the next line.
+            if join is None:
+                continue
             if joinDef is join.joinDef:
                 break
         else: