Fix pure formatting test regressions.

David Blewett · David Blewett · commit 61085fc6fdf0 · 2019-04-07T15:22:52.000-04:00
diff --git a/rure/lib.py b/rure/lib.py
@@ -24,14 +24,14 @@ def checked_call(fn, err, *args):
     all_args = list(args) + [err]
     res = fn(*all_args)
     msg = ffi.string(_lib.rure_error_message(err))
-    if msg == b'no error':
+    msg = msg.decode('utf8')
+    if msg == 'no error':
         return res
-    elif msg.startswith(b'Error parsing regex'):
+    elif msg.startswith(('Error parsing regex', 'regex parse error')):
         raise exceptions.RegexSyntaxError(msg)
-    elif msg.startswith(b'Compiled regex exceeds size limit'):
+    elif msg.startswith('Compiled regex exceeds size limit'):
         raise exceptions.CompiledTooBigError(msg)
     else:
-        msg = bytes(msg, 'utf8')
         raise exceptions.RegexError(msg)
 
 
diff --git a/rure/tests/test_rure.py b/rure/tests/test_rure.py
@@ -119,7 +119,7 @@ def test_compile_error(self):
         try:
             Rure(b"(")
         except RegexSyntaxError as err:
-            self.assertIn("Unclosed parenthesis", err.message)
+            self.assertIn("unclosed group", err.message.lower())
 
     def test_compile_error_size_limit(self):
         try:
diff --git a/rure/tests/test_rureset.py b/rure/tests/test_rureset.py
@@ -44,10 +44,10 @@ def test_compile_error(self):
         try:
             RureSet(b"(")
         except RegexSyntaxError as err:
-            self.assertIn("Unclosed parenthesis", err.message)
+            self.assertIn("unclosed group", err.message.lower())
 
     def test_compile_error_size_limit(self):
         try:
             RureSet(b"\\w{100}", size_limit=0)
         except CompiledTooBigError as err:
-            self.assertIn("exceeds size", err.message)
+            self.assertIn("exceeds size", err.message.lower())
