[Checkins] SVN: Products.ZCatalog/trunk/src/Products/PluginIndexes/common/ handle non-strings in not values

[Hano Schlichting]

Log message for revision 124724:
  handle non-strings in not values
  

Changed:
  U   Products.ZCatalog/trunk/src/Products/PluginIndexes/common/tests/test_util.py
  U   Products.ZCatalog/trunk/src/Products/PluginIndexes/common/util.py

-=-
Modified: Products.ZCatalog/trunk/src/Products/PluginIndexes/common/tests/test_util.py
===================================================================
--- Products.ZCatalog/trunk/src/Products/PluginIndexes/common/tests/test_util.py	2012-03-25 13:44:56 UTC (rev 124723)
+++ Products.ZCatalog/trunk/src/Products/PluginIndexes/common/tests/test_util.py	2012-03-25 14:07:11 UTC (rev 124724)
@@ -74,3 +74,9 @@
         parser = self._makeOne(request, 'path', ('query', 'not'))
         self.assertEqual(parser.get('keys'), ['foo'])
         self.assertEqual(parser.get('not'), ['bar', 'baz'])
+
+    def test_get_not_int(self):
+        request = {'path': 'foo', 'path_not': 0}
+        parser = self._makeOne(request, 'path', ('query', 'not'))
+        self.assertEqual(parser.get('keys'), ['foo'])
+        self.assertEqual(parser.get('not'), [0])

Modified: Products.ZCatalog/trunk/src/Products/PluginIndexes/common/util.py
===================================================================
--- Products.ZCatalog/trunk/src/Products/PluginIndexes/common/util.py	2012-03-25 13:44:56 UTC (rev 124723)
+++ Products.ZCatalog/trunk/src/Products/PluginIndexes/common/util.py	2012-03-25 14:07:11 UTC (rev 124724)
@@ -120,7 +120,7 @@
         self.keys = keys
         not_value = getattr(self, 'not', None)
         if not_value is not None:
-            if isinstance(not_value, basestring):
+            if not isinstance(not_value, (tuple, list)):
                 not_value = [not_value]
                 setattr(self, 'not', not_value)