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

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Aug 22 17:50:46 2007
New Revision: 15783

URL: http://svn.erp5.org?rev=15783&view=rev
Log:
Actualy this bogus-looking code is required to workaround a python weirdness when keyword arguments are used with unknown argument list...

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=15783&r1=15782&r2=15783&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py Wed Aug 22 17:50:46 2007
@@ -440,8 +440,14 @@
   """
   Used in order to concatenate many queries
   """
-  def __init__(self, operator='AND', *args, **kw):
+  def __init__(self, *args, **kw):
     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.__dict__.update(kw)