Simplify code.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15782 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ZSQLCatalog/SQLCatalog.py

@@ -440,14 +440,8 @@ class ComplexQuery(QueryMixin):
   """
   Used in order to concatenate many queries
   """
-  def __init__(self, *args, **kw):
+  def __init__(self, operator='AND', *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)