From 455b24e5f3637e3d4df4e226c347bdea5df32d8a Mon Sep 17 00:00:00 2001
From: Vincent Pelletier <vincent@nexedi.com>
Date: Tue, 7 Mar 2017 13:15:24 +0900
Subject: [PATCH] ZSQLCatalog: Drop compatibility support for "operator"
 argument.

---
 product/ZSQLCatalog/Query/ComplexQuery.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/product/ZSQLCatalog/Query/ComplexQuery.py b/product/ZSQLCatalog/Query/ComplexQuery.py
index 7ae2aaa997..846123cedc 100644
--- a/product/ZSQLCatalog/Query/ComplexQuery.py
+++ b/product/ZSQLCatalog/Query/ComplexQuery.py
@@ -55,9 +55,6 @@ class ComplexQuery(Query):
         Default: 'and'
 
       Deprecated
-        operator ('and', 'or', 'not')
-          See logical_operator.
-          logical_operator takes precedence if given.
         unknown_column_dict (dict)
           Only one key of this dictionnary is used here:
             key: 'from_expression'
@@ -66,7 +63,7 @@ class ComplexQuery(Query):
             provided, this ComplexQuery must have no subquery (regular
             SQLExpression limitation)
     """
-    self.logical_operator = kw.pop('logical_operator', kw.pop('operator', 'and')).lower()
+    self.logical_operator = kw.pop('logical_operator', 'and').lower()
     assert self.logical_operator in ('and', 'or', 'not'), self.logical_operator
     unknown_column_dict = kw.pop('unknown_column_dict', {})
     self.from_expression = unknown_column_dict.pop('from_expression', None)
-- 
2.30.9