Fix 3 issues found on Python 3.14.beta

Author: SylvainDe

.github/workflows/my_github_action.yml

@@ -145,6 +145,7 @@ jobs:
         - '3.13.1'
         - '3.13.2'
         - '3.14.0-alpha.0'
+        - '3.14.0-alpha.7'
         - '3.14.0-beta.1'
 # Disabled because of issue #67        - '3.14.0-alpha.1', ..., '3.14.0-alpha.6'
         - 'pypy-2.7'

didyoumean/didyoumean_re.py

@@ -57,14 +57,15 @@
 INDEXOUTOFRANGE_RE = r"^list index out of range$"
 ZERO_LEN_FIELD_RE = r"^zero length field name in format$"
 MATH_DOMAIN_ERROR_RE = r"^math domain error|" \
-    r"expected a positive input, got -\d+$"
+    r"expected a positive input(?:, got -\d+)?$"
 TOO_MANY_VALUES_UNPACK_RE = r"^too many values " \
     r"to unpack(?: \(expected.*\))?$"
 OUTSIDE_FUNCTION_RE = r"^'?(\w+)'? outside function$"
 NEED_MORE_VALUES_RE = r"^(?:need more than \d+|not enough) values to unpack" \
     r"(?: \(expected \d+, got \d+\))?$"
-UNHASHABLE_RE = r"^(?:unhashable type: )?'({0})'" \
-    r"(?: objects are unhashable)?$".format(TYPE_NAME)
+UNHASHABLE_RE = r"^(?:cannot use '{0}' as a {0} element \(?)?" \
+    r"(?:unhashable type: )?'({0})'" \
+    r"(?: objects are unhashable)?.?$".format(TYPE_NAME)
 MISSING_PARENT_RE = r"^Missing parentheses in call to " \
     r"'(?P<func>{0})'(?:. Did you mean.*)?$".format(FUNC_NAME)
 INVALID_LITERAL_RE = r"^invalid literal for (\w+)\(\) with base \d+: '(.*)'$"

didyoumean/didyoumean_re_tests.py

@@ -370,10 +370,12 @@ def test_zero_length_field(self):
 
     def test_math_domain_error(self):
         """Test MATH_DOMAIN_ERROR_RE."""
-        # Python 2.6/2.7/3.2/3.3/3.4/3.5/PyPy/PyPy3
         msgs = [
+            # Python 2.6/2.7/3.2/3.3/3.4/3.5/PyPy/PyPy3
             "math domain error",
             "expected a positive input, got -1",
+            # Python 3.14.0.b
+            "expected a positive input",
         ]
         for msg in msgs:
             self.re_matches(msg, re.MATH_DOMAIN_ERROR_RE, NO_GROUP)
@@ -396,6 +398,8 @@ def test_unhashable_type(self):
         msgs = [
             # Python 2.6/2.7/3.2/3.3/3.4/3.5
             "unhashable type: 'list'",
+            # Python 3.14.0.b
+            "cannot use 'list' as a set element (unhashable type: 'list')",
             # PyPy/PyPy3
             "'list' objects are unhashable",
         ]
@@ -701,6 +705,11 @@ def test_unsupported_operand(self):
              '-',
              'builtin_function',
              'int'),
+            # Python 3.14.0.b
+            ("unsupported operand type(s) for >>: 'builtin_function_or_method' and '_io.TextIOWrapper'",
+             '>>',
+             'builtin_function_or_method',
+             '_io.TextIOWrapper'),
         ]
         for msg, op, t1, t2 in msgs:
             groups = op, t1, t2

didyoumean/didyoumean_sugg_tests.py

@@ -1909,14 +1909,16 @@ def test_old_print_syntax(self):
 
     def test_old_print_chevron_syntax(self):
         """Trying old print chevron syntax (before Python 3)."""
-        before, mid, after = before_mid_and_after((3, 0), (3, 6))
+        before, mid1, mid2, after = ranges_between((3, 0), (3, 6), (3, 14, 0, 'beta'))
         code = "with open('/dev/null', 'w') as f:\n\tprint >> f, 5"
         sugg = '"print(<message>, file=<output_stream>)"'
         good_code = "with open('/dev/null', 'w') as f:\n\tprint('5', file=f)"
         self.runs(code, before)
-        self.throws(code, UNSUPPORTEDOPERAND, sugg, mid)
-        self.throws(code, UNSUPPORTEDOPERANDSUGG, [], after)
-        self.runs(good_code, mid)
+        self.throws(code, UNSUPPORTEDOPERAND, sugg, mid1)
+        self.throws(code, UNSUPPORTEDOPERANDSUGG, [], mid2)
+        self.throws(code, UNSUPPORTEDOPERAND, sugg, after)
+        self.runs(good_code, mid2)
+        self.runs(good_code, mid2)
         self.runs(good_code, after)
 
     def test_assignment_to_range(self):