Fix previous commit

Code does run on PyPy Regexp can now be properly written and tested.
SylvainDe · Jan 17, 2017 · d92e73d · d92e73d
1 parent c74bffe
commit d92e73d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/didyoumean/didyoumean_re.py b/didyoumean/didyoumean_re.py
@@ -32,6 +32,7 @@
 UNEXPECTED_KEYWORDARG2_RE = r"^'(?P<arg>{0})' is an " \
     r"invalid keyword argument for this function$".format(ARG_NAME)
 UNEXPECTED_KEYWORDARG3_RE = r"^invalid keyword arguments to (\w+)\(\)$"
+FUNC_TAKES_NO_KEYWORDARG_RE = r"^(\w+)\(\) takes no keyword arguments$"
 NOMODULE_RE = r"^No module named '?({0})'?$".format(MODULE_NAME)
 CANNOTIMPORT_RE = r"^cannot import name '?(\w+)'?$"
 INDEXOUTOFRANGE_RE = r"^list index out of range$"

diff --git a/didyoumean/didyoumean_re_tests.py b/didyoumean/didyoumean_re_tests.py
@@ -241,6 +241,14 @@ def test_unexpected_kw_arg3(self):
         results = (groups, dict())
         self.re_matches(msg, re.UNEXPECTED_KEYWORDARG3_RE, results)
 
+    def test_func_takes_no_kwarg(self):
+        """Test FUNC_TAKES_NO_KEYWORDARG_RE."""
+        # Cython
+        msg = "get() takes no keyword arguments"
+        groups = ('get', )
+        results = (groups, dict())
+        self.re_matches(msg, re.FUNC_TAKES_NO_KEYWORDARG_RE, results)
+
     def test_zero_length_field(self):
         """Test ZERO_LEN_FIELD_RE."""
         # Python 2.6

diff --git a/didyoumean/didyoumean_sugg_tests.py b/didyoumean/didyoumean_sugg_tests.py
@@ -279,7 +279,7 @@ def get_exception(code):
 UNEXPECTEDKWARG = (TypeError, re.UNEXPECTED_KEYWORDARG_RE)
 UNEXPECTEDKWARG2 = (TypeError, re.UNEXPECTED_KEYWORDARG2_RE)
 UNEXPECTEDKWARG3 = (TypeError, re.UNEXPECTED_KEYWORDARG3_RE)
-NOKWARGS = (TypeError, r'^get\(\) takes no keyword arguments$')
+NOKWARGS = (TypeError, re.FUNC_TAKES_NO_KEYWORDARG_RE)
 UNSUPPORTEDOPERAND = (TypeError, re.UNSUPPORTED_OP_RE)
 BADOPERANDUNARY = (TypeError, re.BAD_OPERAND_UNARY_RE)
 OBJECTDOESNOTSUPPORT = (TypeError, re.OBJ_DOES_NOT_SUPPORT_RE)
@@ -1484,7 +1484,8 @@ def test_c_func_takes_no_keyword_arguments(self):
         code = 'dict().get(0, {0}None)'
         good_code, bad_code = format_str(code, '', 'default=')
         self.runs(good_code)
-        self.throws(bad_code, NOKWARGS, [])
+        self.throws(bad_code, NOKWARGS, interpreters='cython')
+        self.runs(bad_code, interpreters='pypy')
 
     def test_iter_cannot_be_interpreted_as_int(self):
         """Trying to call `range(len(iterable))` (bad) and forget the len."""