Python 3.x compatibility for test_validators

Author: amysutedja

tests/searchcommands/test_validators.py

@@ -68,15 +68,15 @@ def test_duration(self):
         validator = validators.Duration()
 
         for seconds in range(0, 25 * 60 * 60, 59):
-            for value in six.text_type(seconds), bytes(seconds):
-                self.assertEqual(validator(value), seconds)
-                self.assertEqual(validator(validator.format(seconds)), seconds)
-                value = '%d:%02d' % (seconds / 60, seconds % 60)
-                self.assertEqual(validator(value), seconds)
-                self.assertEqual(validator(validator.format(seconds)), seconds)
-                value = '%d:%02d:%02d' % (seconds / 3600, (seconds / 60) % 60, seconds % 60)
-                self.assertEqual(validator(value), seconds)
-                self.assertEqual(validator(validator.format(seconds)), seconds)
+            value = six.text_type(seconds)
+            self.assertEqual(validator(value), seconds)
+            self.assertEqual(validator(validator.format(seconds)), seconds)
+            value = '%d:%02d' % (seconds / 60, seconds % 60)
+            self.assertEqual(validator(value), seconds)
+            self.assertEqual(validator(validator.format(seconds)), seconds)
+            value = '%d:%02d:%02d' % (seconds / 3600, (seconds / 60) % 60, seconds % 60)
+            self.assertEqual(validator(value), seconds)
+            self.assertEqual(validator(validator.format(seconds)), seconds)
 
         self.assertEqual(validator('230:00:00'), 230 * 60 * 60)
         self.assertEqual(validator('23:00:00'), 23 * 60 * 60)
@@ -248,9 +248,11 @@ def test_option_name(self):
         pass
 
     def test_regular_expression(self):
-
         validator = validators.RegularExpression()
-        self.assertIsInstance(validator.__call__('a'), re._pattern_type)
+
+        # duck-type: act like it's a regex and allow failure if it isn't one
+        validator.__call__('a').match('a')
+
         self.assertEqual(validator.__call__(None), None)
         self.assertRaises(ValueError, validator.__call__, '(a')