Skip to content

Commit fc6495d

Browse files
committed
Make all the name and fullname methods into properties
1 parent 91be66f commit fc6495d

File tree

1 file changed

+23
-2
lines changed

1 file changed

+23
-2
lines changed

mypy/nodes.py

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,14 +200,14 @@ class SymbolNode(Node):
200200

201201
__slots__ = ()
202202

203-
# TODO do not use methods for these
204-
203+
@property
205204
@abstractmethod
206205
def name(self) -> str: pass
207206

208207
# fullname can often be None even though the type system
209208
# disagrees. We mark this with Bogus to let mypyc know not to
210209
# worry about it.
210+
@property
211211
@abstractmethod
212212
def fullname(self) -> Bogus[str]: pass
213213

@@ -282,9 +282,11 @@ def local_definitions(self) -> Iterator[Definition]:
282282
"""
283283
return local_definitions(self.names, self.fullname())
284284

285+
@property
285286
def name(self) -> str:
286287
return '' if not self._fullname else self._fullname.split('.')[-1]
287288

289+
@property
288290
def fullname(self) -> Bogus[str]:
289291
return self._fullname
290292

@@ -399,9 +401,11 @@ def __init__(self, target_fullname: str) -> None:
399401
super().__init__()
400402
self.target_fullname = target_fullname
401403

404+
@property
402405
def name(self) -> str:
403406
return self.target_fullname.split('.')[-1]
404407

408+
@property
405409
def fullname(self) -> str:
406410
return self.target_fullname
407411

@@ -463,9 +467,11 @@ def __init__(self) -> None:
463467
# TODO: Type should be Optional[str]
464468
self._fullname = cast(Bogus[str], None)
465469

470+
@property
466471
@abstractmethod
467472
def name(self) -> str: pass
468473

474+
@property
469475
def fullname(self) -> Bogus[str]:
470476
return self._fullname
471477

@@ -496,6 +502,7 @@ def __init__(self, items: List['OverloadPart']) -> None:
496502
self.set_line(items[0].line, items[0].column)
497503
self.is_final = False
498504

505+
@property
499506
def name(self) -> str:
500507
if self.items:
501508
return self.items[0].name()
@@ -661,6 +668,7 @@ def __init__(self,
661668
# Original conditional definition
662669
self.original_def = None # type: Union[None, FuncDef, Var, Decorator]
663670

671+
@property
664672
def name(self) -> str:
665673
return self._name
666674

@@ -734,9 +742,11 @@ def __init__(self, func: FuncDef, decorators: List[Expression],
734742
self.var = var
735743
self.is_overload = False
736744

745+
@property
737746
def name(self) -> str:
738747
return self.func.name()
739748

749+
@property
740750
def fullname(self) -> Bogus[str]:
741751
return self.func.fullname()
742752

@@ -852,9 +862,11 @@ def __init__(self, name: str, type: 'Optional[mypy.types.Type]' = None) -> None:
852862
# If True, this is an implicit Var created due to module-level __getattr__.
853863
self.from_module_getattr = False
854864

865+
@property
855866
def name(self) -> str:
856867
return self._name
857868

869+
@property
858870
def fullname(self) -> Bogus[str]:
859871
return self._fullname
860872

@@ -1818,6 +1830,7 @@ def accept(self, visitor: ExpressionVisitor[T]) -> T:
18181830
class LambdaExpr(FuncItem, Expression):
18191831
"""Lambda expression"""
18201832

1833+
@property
18211834
def name(self) -> str:
18221835
return '<lambda>'
18231836

@@ -2059,9 +2072,11 @@ def __init__(self, name: str, fullname: str,
20592072
self.upper_bound = upper_bound
20602073
self.variance = variance
20612074

2075+
@property
20622076
def name(self) -> str:
20632077
return self._name
20642078

2079+
@property
20652080
def fullname(self) -> str:
20662081
return self._fullname
20672082

@@ -2388,10 +2403,12 @@ def add_type_vars(self) -> None:
23882403
for vd in self.defn.type_vars:
23892404
self.type_vars.append(vd.fullname)
23902405

2406+
@property
23912407
def name(self) -> str:
23922408
"""Short name."""
23932409
return self.defn.name
23942410

2411+
@property
23952412
def fullname(self) -> Bogus[str]:
23962413
return self._fullname
23972414

@@ -2737,9 +2754,11 @@ def __init__(self, target: 'mypy.types.Type', fullname: str, line: int, column:
27372754
self.normalized = normalized
27382755
super().__init__(line, column)
27392756

2757+
@property
27402758
def name(self) -> str:
27412759
return self._fullname.split('.')[-1]
27422760

2761+
@property
27432762
def fullname(self) -> str:
27442763
return self._fullname
27452764

@@ -2828,9 +2847,11 @@ def __init__(self, fullname: str, node: Node, line: int, *,
28282847
self.becomes_typeinfo = becomes_typeinfo
28292848
self.line = line
28302849

2850+
@property
28312851
def name(self) -> str:
28322852
return self._fullname.split('.')[-1]
28332853

2854+
@property
28342855
def fullname(self) -> str:
28352856
return self._fullname
28362857

0 commit comments

Comments
 (0)