[SQL-CVS] r548 - trunk/SQLObject/sqlobject

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

Author: phd
Date: 2005-01-15 13:21:28 +0000 (Sat, 15 Jan 2005)
New Revision: 548

Modified:
   trunk/SQLObject/sqlobject/joins.py
Log:
Fixed incompatibility with Python 2.2: used col.popKey() instead of kw.pop().


Modified: trunk/SQLObject/sqlobject/joins.py
===================================================================
--- trunk/SQLObject/sqlobject/joins.py	2005-01-15 12:50:16 UTC (rev 547)
+++ trunk/SQLObject/sqlobject/joins.py	2005-01-15 13:21:28 UTC (rev 548)
@@ -2,6 +2,7 @@
 NoDefault = sqlbuilder.NoDefault
 import styles
 import classregistry
+from col import popKey
 
 __all__ = ['MultipleJoin', 'RelatedJoin']
 
@@ -18,7 +19,7 @@
         kw['joinDef'] = self
         self.kw = kw
         if self.kw.has_key('joinMethodName'):
-            self._joinMethodName = self.kw.pop('joinMethodName')
+            self._joinMethodName = popKey(self.kw, 'joinMethodName')
         else:
             self._joinMethodName = None