From 82c53135f7433e82fd9efbb1d4d74914bdbdc7fe Mon Sep 17 00:00:00 2001 From: Max Moroz Date: Mon, 22 May 2017 11:34:30 -0700 Subject: [PATCH 1/3] Add line # of previous definition --- mypy/semanal.py | 11 ++++++++--- test-data/unit/check-classes.test | 2 +- test-data/unit/check-functions.test | 4 ++-- test-data/unit/check-overloading.test | 2 +- test-data/unit/semanal-errors.test | 10 +++++----- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/mypy/semanal.py b/mypy/semanal.py index b14e3dd9076e..381a6160b6ab 100644 --- a/mypy/semanal.py +++ b/mypy/semanal.py @@ -3315,7 +3315,7 @@ def check_no_global(self, n: str, ctx: Context, elif prev_is_overloaded: self.fail("Definition of '{}' missing 'overload'".format(n), ctx) else: - self.name_already_defined(n, ctx) + self.name_already_defined(n, ctx, self.globals[n]) def name_not_defined(self, name: str, ctx: Context) -> None: message = "Name '{}' is not defined".format(name) @@ -3324,8 +3324,13 @@ def name_not_defined(self, name: str, ctx: Context) -> None: message += ' {}'.format(extra) self.fail(message, ctx) - def name_already_defined(self, name: str, ctx: Context) -> None: - self.fail("Name '{}' already defined".format(name), ctx) + def name_already_defined(self, name: str, ctx: Context, + original_ctx: Optional[SymbolTableNode] = None) -> None: + if original_ctx: + extra_msg = ' in line {}'.format(original_ctx.node.get_line()) + else: + extra_msg = '' + self.fail("Name '{}' already defined{}".format(name, extra_msg), ctx) def fail(self, msg: str, ctx: Context, serious: bool = False, *, blocker: bool = False) -> None: diff --git a/test-data/unit/check-classes.test b/test-data/unit/check-classes.test index a257fa0375f0..3b9084b1217f 100644 --- a/test-data/unit/check-classes.test +++ b/test-data/unit/check-classes.test @@ -714,7 +714,7 @@ A() class A: pass class A: pass [out] -main:4: error: Name 'A' already defined +main:4: error: Name 'A' already defined in line 3 [case testDocstringInClass] import typing diff --git a/test-data/unit/check-functions.test b/test-data/unit/check-functions.test index 8ac35e052659..feb789957837 100644 --- a/test-data/unit/check-functions.test +++ b/test-data/unit/check-functions.test @@ -1212,7 +1212,7 @@ from typing import Any x = None # type: Any if x: def f(): pass -def f(): pass # E: Name 'f' already defined +def f(): pass # E: Name 'f' already defined in line 4 [case testIncompatibleConditionalFunctionDefinition] from typing import Any @@ -1835,7 +1835,7 @@ f = g # E: Incompatible types in assignment (expression has type Callable[[Any, [case testRedefineFunction2] def f() -> None: pass -def f() -> None: pass # E: Name 'f' already defined +def f() -> None: pass # E: Name 'f' already defined in line 1 -- Special cases diff --git a/test-data/unit/check-overloading.test b/test-data/unit/check-overloading.test index 69289fae18c1..d4a1b448fdb2 100644 --- a/test-data/unit/check-overloading.test +++ b/test-data/unit/check-overloading.test @@ -1106,7 +1106,7 @@ def f(a: int) -> None: pass def f(a: str) -> None: pass [out] tmp/foo.pyi:2: error: Single overload definition, multiple required -tmp/foo.pyi:5: error: Name 'f' already defined +tmp/foo.pyi:5: error: Name 'f' already defined in line 2 [case testOverloadTuple] from foo import * diff --git a/test-data/unit/semanal-errors.test b/test-data/unit/semanal-errors.test index 99584e77a977..0692b79c96de 100644 --- a/test-data/unit/semanal-errors.test +++ b/test-data/unit/semanal-errors.test @@ -165,7 +165,7 @@ import typing class A: pass class A: pass [out] -main:3: error: Name 'A' already defined +main:3: error: Name 'A' already defined in line 2 [case testMultipleMixedDefinitions] import typing @@ -173,8 +173,8 @@ x = 1 def x(): pass class x: pass [out] -main:3: error: Name 'x' already defined -main:4: error: Name 'x' already defined +main:3: error: Name 'x' already defined in line 2 +main:4: error: Name 'x' already defined in line 2 [case testNameNotImported] import typing @@ -1037,13 +1037,13 @@ t = 1 # E: Invalid assignment target [case testRedefineTypevar2] from typing import TypeVar t = TypeVar('t') -def t(): pass # E: Name 't' already defined +def t(): pass # E: Name 't' already defined in line 2 [out] [case testRedefineTypevar3] from typing import TypeVar t = TypeVar('t') -class t: pass # E: Name 't' already defined +class t: pass # E: Name 't' already defined in line 2 [out] [case testRedefineTypevar4] From 5b077aeb19f351f2b4e8293d71c1672855928054 Mon Sep 17 00:00:00 2001 From: Max Moroz Date: Mon, 22 May 2017 14:39:01 -0700 Subject: [PATCH 2/3] CR fix --- mypy/semanal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mypy/semanal.py b/mypy/semanal.py index 381a6160b6ab..024bb7960277 100644 --- a/mypy/semanal.py +++ b/mypy/semanal.py @@ -3327,7 +3327,7 @@ def name_not_defined(self, name: str, ctx: Context) -> None: def name_already_defined(self, name: str, ctx: Context, original_ctx: Optional[SymbolTableNode] = None) -> None: if original_ctx: - extra_msg = ' in line {}'.format(original_ctx.node.get_line()) + extra_msg = ' on line {}'.format(original_ctx.node.get_line()) else: extra_msg = '' self.fail("Name '{}' already defined{}".format(name, extra_msg), ctx) From 39c30589235a479fe2401d3a1be170dfbcb2c90b Mon Sep 17 00:00:00 2001 From: Max Moroz Date: Mon, 22 May 2017 14:46:30 -0700 Subject: [PATCH 3/3] Fix tests --- test-data/unit/check-classes.test | 2 +- test-data/unit/check-functions.test | 4 ++-- test-data/unit/check-overloading.test | 2 +- test-data/unit/semanal-errors.test | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test-data/unit/check-classes.test b/test-data/unit/check-classes.test index 3b9084b1217f..3e9ab9924809 100644 --- a/test-data/unit/check-classes.test +++ b/test-data/unit/check-classes.test @@ -714,7 +714,7 @@ A() class A: pass class A: pass [out] -main:4: error: Name 'A' already defined in line 3 +main:4: error: Name 'A' already defined on line 3 [case testDocstringInClass] import typing diff --git a/test-data/unit/check-functions.test b/test-data/unit/check-functions.test index feb789957837..fb76185569d5 100644 --- a/test-data/unit/check-functions.test +++ b/test-data/unit/check-functions.test @@ -1212,7 +1212,7 @@ from typing import Any x = None # type: Any if x: def f(): pass -def f(): pass # E: Name 'f' already defined in line 4 +def f(): pass # E: Name 'f' already defined on line 4 [case testIncompatibleConditionalFunctionDefinition] from typing import Any @@ -1835,7 +1835,7 @@ f = g # E: Incompatible types in assignment (expression has type Callable[[Any, [case testRedefineFunction2] def f() -> None: pass -def f() -> None: pass # E: Name 'f' already defined in line 1 +def f() -> None: pass # E: Name 'f' already defined on line 1 -- Special cases diff --git a/test-data/unit/check-overloading.test b/test-data/unit/check-overloading.test index d4a1b448fdb2..f3e5b993a325 100644 --- a/test-data/unit/check-overloading.test +++ b/test-data/unit/check-overloading.test @@ -1106,7 +1106,7 @@ def f(a: int) -> None: pass def f(a: str) -> None: pass [out] tmp/foo.pyi:2: error: Single overload definition, multiple required -tmp/foo.pyi:5: error: Name 'f' already defined in line 2 +tmp/foo.pyi:5: error: Name 'f' already defined on line 2 [case testOverloadTuple] from foo import * diff --git a/test-data/unit/semanal-errors.test b/test-data/unit/semanal-errors.test index 0692b79c96de..622008f7fb95 100644 --- a/test-data/unit/semanal-errors.test +++ b/test-data/unit/semanal-errors.test @@ -165,7 +165,7 @@ import typing class A: pass class A: pass [out] -main:3: error: Name 'A' already defined in line 2 +main:3: error: Name 'A' already defined on line 2 [case testMultipleMixedDefinitions] import typing @@ -173,8 +173,8 @@ x = 1 def x(): pass class x: pass [out] -main:3: error: Name 'x' already defined in line 2 -main:4: error: Name 'x' already defined in line 2 +main:3: error: Name 'x' already defined on line 2 +main:4: error: Name 'x' already defined on line 2 [case testNameNotImported] import typing @@ -1037,13 +1037,13 @@ t = 1 # E: Invalid assignment target [case testRedefineTypevar2] from typing import TypeVar t = TypeVar('t') -def t(): pass # E: Name 't' already defined in line 2 +def t(): pass # E: Name 't' already defined on line 2 [out] [case testRedefineTypevar3] from typing import TypeVar t = TypeVar('t') -class t: pass # E: Name 't' already defined in line 2 +class t: pass # E: Name 't' already defined on line 2 [out] [case testRedefineTypevar4]