Merge branch 'main' into pytokens

psf · Dec 23, 2024 · 4dace1a · 4dace1a
2 parents 1e105f8 + 0aabac4
commit 4dace1a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/blib2to3/pgen2/pgen.py b/src/blib2to3/pgen2/pgen.py
@@ -356,7 +356,9 @@ def raise_error(self, msg: str, *args: Any) -> NoReturn:
                 msg = msg % args
             except Exception:
                 msg = " ".join([msg] + list(map(str, args)))
-        raise SyntaxError(msg, (self.filename, self.end[0], self.end[1], self.line))
+        raise SyntaxError(
+            msg, (str(self.filename), self.end[0], self.end[1], self.line)
+        )
 
 
 class NFAState:

diff --git a/tests/data/cases/annotations.py b/tests/data/cases/annotations.py
@@ -0,0 +1,17 @@
+# regression test for #1765
+class Foo:
+    def foo(self):
+        if True:
+            content_ids: Mapping[
+                str, Optional[ContentId]
+            ] = self.publisher_content_store.store_config_contents(files)
+
+# output
+
+# regression test for #1765
+class Foo:
+    def foo(self):
+        if True:
+            content_ids: Mapping[str, Optional[ContentId]] = (
+                self.publisher_content_store.store_config_contents(files)
+            )