Fix call patterns that contain as-expression on the kwargs (#2749)

[etc/vim.git] / src / blib2to3 / pytree.py

diff --git a/src/blib2to3/pytree.py b/src/blib2to3/pytree.py
index 001652df09fb85d623ede558f75a2ea102549e4e..bd86270b8e232d1230fde477b38ff4ca2836d710 100644 (file)
--- a/src/blib2to3/pytree.py
+++ b/src/blib2to3/pytree.py
@@ -14,7 +14,6 @@ There's also a pattern matching implementation here.
 
 from typing import (
     Any,
 
 from typing import (
     Any,

-    Callable,

     Dict,
     Iterator,
     List,
     Dict,
     Iterator,
     List,


@@ -92,8 +91,6 @@ class Base(object):
             return NotImplemented
         return self._eq(other)
 
             return NotImplemented
         return self._eq(other)
 

-    __hash__ = None  # type: Any  # For Py3 compatibility.
-

     @property
     def prefix(self) -> Text:
         raise NotImplementedError
     @property
     def prefix(self) -> Text:
         raise NotImplementedError


@@ -437,7 +434,7 @@ class Leaf(Base):
 
         This reproduces the input source exactly.
         """
 
         This reproduces the input source exactly.
         """

-        return self.prefix + str(self.value)
+        return self._prefix + str(self.value)

 
     def _eq(self, other) -> bool:
         """Compare two nodes for equality."""
 
     def _eq(self, other) -> bool:
         """Compare two nodes for equality."""


@@ -672,8 +669,11 @@ class NodePattern(BasePattern):
             newcontent = list(content)
             for i, item in enumerate(newcontent):
                 assert isinstance(item, BasePattern), (i, item)
             newcontent = list(content)
             for i, item in enumerate(newcontent):
                 assert isinstance(item, BasePattern), (i, item)

-                if isinstance(item, WildcardPattern):
-                    self.wildcards = True
+                # I don't even think this code is used anywhere, but it does cause
+                # unreachable errors from mypy. This function's signature does look
+                # odd though *shrug*.
+                if isinstance(item, WildcardPattern):  # type: ignore[unreachable]
+                    self.wildcards = True  # type: ignore[unreachable]

         self.type = type
         self.content = newcontent
         self.name = name
         self.type = type
         self.content = newcontent
         self.name = name


@@ -978,6 +978,3 @@ def generate_matches(
                     r.update(r0)
                     r.update(r1)
                     yield c0 + c1, r
                     r.update(r0)
                     r.update(r1)
                     yield c0 + c1, r

-
-
-_Convert = Callable[[Grammar, RawNode], Any]