Skip to content

Commit e6904d8

Browse files
committed
for testing: do not mangle annotations when defined in stub files
1 parent 292890a commit e6904d8

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

mypy/fastparse.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -361,15 +361,15 @@ class NameMangler(ast3.NodeTransformer):
361361

362362
_name_complete: str
363363
_name_trimmed: str
364-
_future_annotations: bool
364+
_mangle_annotations: bool
365365
_unmangled_args: set[str]
366366

367367
_MANGLE_ARGS: bool = False
368368

369-
def __init__(self, classname: str, future_annotations: bool) -> None:
369+
def __init__(self, classname: str, mangle_annotations: bool) -> None:
370370
self._name_complete = classname
371371
self._name_trimmed = classname.lstrip("_")
372-
self._future_annotations = future_annotations
372+
self._mangle_annotations = mangle_annotations
373373
self._unmangled_args = set()
374374

375375
def _mangle(self, name: str) -> str:
@@ -394,11 +394,11 @@ def _visit_funcdef(self, node: _T_FuncDef) -> _T_FuncDef:
394394
if self._MANGLE_ARGS:
395395
mangler = self
396396
else:
397-
mangler = NameMangler(self._name_complete, self._future_annotations)
397+
mangler = NameMangler(self._name_complete, self._mangle_annotations)
398398
mangler.visit(node.args)
399399
for dec in node.decorator_list:
400400
mangler.visit(dec)
401-
if (node.returns is not None) and not self._future_annotations:
401+
if self._mangle_annotations and (node.returns is not None):
402402
mangler.visit(node.returns)
403403
for stmt in node.body:
404404
mangler.visit(stmt)
@@ -409,7 +409,7 @@ def visit_arg(self, node: ast3.arg) -> ast3.arg:
409409
node.arg = self._mangle(node.arg)
410410
else:
411411
self._unmangled_args.add(node.arg)
412-
if (node.annotation is not None) and not self._future_annotations:
412+
if self._mangle_annotations and (node.annotation is not None):
413413
self.visit(node.annotation)
414414
return node
415415

@@ -426,7 +426,7 @@ def visit_ClassDef(self, node: ast3.ClassDef) -> ast3.ClassDef:
426426
else:
427427
for dec in node.decorator_list:
428428
self.visit(dec)
429-
NameMangler(node.name, self._future_annotations).visit(node)
429+
NameMangler(node.name, self._mangle_annotations).visit(node)
430430
node.name = self._mangle(node.name)
431431
return node
432432

@@ -450,7 +450,7 @@ def visit_AnnAssign(self, node: ast3.AnnAssign) -> ast3.AnnAssign:
450450
self.visit(node.target)
451451
if node.value is not None:
452452
self.visit(node.value)
453-
if not self._future_annotations:
453+
if self._mangle_annotations:
454454
self.visit(node.annotation)
455455
return node
456456

@@ -1235,13 +1235,13 @@ def visit_ClassDef(self, n: ast3.ClassDef) -> ClassDef:
12351235
if sys.version_info >= (3, 12) and n.type_params:
12361236
explicit_type_params = self.translate_type_params(n.type_params)
12371237

1238-
future_annotations = any(
1238+
mangle_annotations = not self.is_stub and not any(
12391239
isinstance(i, ImportFrom)
12401240
and (i.id == "__future__")
12411241
and any(j[0] == "annotations" for j in i.names)
12421242
for i in self.imports
12431243
)
1244-
NameMangler(n.name, future_annotations).visit(n)
1244+
NameMangler(n.name, mangle_annotations).visit(n)
12451245

12461246
cdef = ClassDef(
12471247
n.name,

0 commit comments

Comments
 (0)