Merge pull request #331 from xrmx/miscwarnings

Fix a couple of warnings spotted when running python 2.7 tests

Author: ashah-splunk

splunklib/searchcommands/validators.py

@@ -95,10 +95,7 @@ def __call__(self, value):
         try:
             return Code.object(compile(value, 'string', self._mode), six.text_type(value))
         except (SyntaxError, TypeError) as error:
-            if six.PY2:
-                message = error.message
-            else:
-                message = str(error)
+            message = str(error)
 
             six.raise_from(ValueError(message), error)
 

tests/searchcommands/test_search_command.py

@@ -140,7 +140,7 @@ def test_process_scpv1(self):
         result = BytesIO()
 
         self.assertRaises(SystemExit, command.process, argv, ofile=result)
-        self.assertRegexpMatches(result.getvalue().decode('UTF-8'), expected)
+        six.assertRegex(self, result.getvalue().decode('UTF-8'), expected)
 
         # TestCommand.process should return configuration settings on Getinfo probe
 
@@ -307,7 +307,8 @@ def test_process_scpv1(self):
             command.process(argv, ifile, ofile=result)
         except SystemExit as error:
             self.assertNotEqual(error.code, 0)
-            self.assertRegexpMatches(
+            six.assertRegex(
+                self,
                 result.getvalue().decode('UTF-8'),
                 r'^error_message=RuntimeError at ".+", line \d+ : Testing\r\n\r\n$')
         except BaseException as error:
@@ -331,7 +332,8 @@ def test_process_scpv1(self):
         except BaseException as error:
             self.fail('Expected no exception, but caught {}: {}'.format(type(error).__name__, error))
         else:
-            self.assertRegexpMatches(
+            six.assertRegex(
+                self,
                 result.getvalue().decode('UTF-8'),
                 r'^\r\n'
                 r'('
@@ -715,7 +717,8 @@ def test_process_scpv2(self):
                 r'logging_configuration=\\\".+\\\" logging_level=\\\"WARNING\\\" record=\\\"f\\\" ' \
                 r'required_option_1=\\\"value_1\\\" required_option_2=\\\"value_2\\\" show_configuration=\\\"f\\\"\"\]\]\}'
 
-        self.assertRegexpMatches(
+        six.assertRegex(
+            self,
             result.getvalue().decode('utf-8'),
             r'^chunked 1.0,2,0\n'
             r'\{\}\n'

tests/test_examples.py

@@ -146,7 +146,7 @@ def test_handlers(self):
         result = run(
             "handlers/handlers_certs.py --ca_file=handlers/cacert.bad.pem",
             stderr=PIPE)
-        self.assertNotEquals(result, 0)
+        self.assertNotEqual(result, 0)
 
         # The proxy handler example requires that there be a proxy available
         # to relay requests, so we spin up a local proxy using the proxy
@@ -167,7 +167,7 @@ def test_handlers(self):
         # Run it again without the proxy and it should fail.
         result = run(
             "handlers/handler_proxy.py --proxy=localhost:80801", stderr=PIPE)
-        self.assertNotEquals(result, 0)
+        self.assertNotEqual(result, 0)
 
     def test_index(self):
         self.check_commands(

tests/test_service.py

@@ -194,7 +194,7 @@ def test_login_and_store_cookie(self):
         self.assertEqual(len(self.service.get_cookies()), 0)
         self.service.login()
         self.assertIsNotNone(self.service.get_cookies())
-        self.assertNotEquals(self.service.get_cookies(), {})
+        self.assertNotEqual(self.service.get_cookies(), {})
         self.assertEqual(len(self.service.get_cookies()), 1)
 
     def test_login_with_cookie(self):