[Erp5-report] r15784 - /erp5/trunk/products/ZSQLCatalog/SQLCatalog.py

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Aug 22 17:58:15 2007
New Revision: 15784

URL: http://svn.erp5.org?rev=15784&view=rev
Log:
Comment weirdness, simplify code, and add a comment about suspicious code.

Modified:
    erp5/trunk/products/ZSQLCatalog/SQLCatalog.py

Modified: erp5/trunk/products/ZSQLCatalog/SQLCatalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/SQLCatalog.py?rev=15784&r1=15783&r2=15784&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py Wed Aug 22 17:58:15 2007
@@ -441,14 +441,15 @@
   Used in order to concatenate many queries
   """
   def __init__(self, *args, **kw):
+    # XXX: python weirdness
+    # >>> def foo(a='a', *args):
+    # ...   pass
+    # ...
+    # >>> foo('something', a='test')
+    # TypeError: foo() got multiple values for keyword argument 'a'
     self.query_list = args
-    operator = None
-    if kw.has_key('operator'):
-      operator = kw['operator']
-      del kw['operator']
-    if operator is None:
-      operator = 'AND'
-    self.operator = operator
+    self.operator = kw.pop('operator', 'AND')
+    # XXX: What is that used for ?! It's utterly dangerous.
     self.__dict__.update(kw)
 
   def __call__(self):