Fix #214 (#1609)

* remove test for nonconsecutive overloads

This doesn't seem to be testing what it says it is.
Nonconsecutive overloads result in a different error,
as described in #409. This test should be added to
check that behavior once it is fixed.

* fix error message for global function redefinition

mypy/semanal.py

@@ -2209,11 +2209,7 @@ def add_local(self, node: Union[Var, FuncBase], ctx: Context) -> None:
     def check_no_global(self, n: str, ctx: Context,
                         is_func: bool = False) -> None:
         if n in self.globals:
-            if is_func and isinstance(self.globals[n].node, FuncDef):
-                self.fail(("Name '{}' already defined (overload variants "
-                           "must be next to each other)").format(n), ctx)
-            else:
-                self.name_already_defined(n, ctx)
+            self.name_already_defined(n, ctx)
 
     def name_not_defined(self, name: str, ctx: Context) -> None:
         message = "Name '{}' is not defined".format(name)

mypy/test/data/check-functions.test

@@ -1073,7 +1073,7 @@ from typing import Any
 x = None # type: Any
 if x:
     def f(): pass
-def f(): pass # E: Name 'f' already defined (overload variants must be next to each other)
+def f(): pass # E: Name 'f' already defined
 
 [case testIncompatibleConditionalFunctionDefinition]
 from typing import Any
@@ -1515,6 +1515,10 @@ def h(y): pass
 f = h
 f = g # E: Incompatible types in assignment (expression has type Callable[[Any, Any], Any], variable has type Callable[[Any], Any])
 
+[case testRedefineFunction2]
+def f() -> None: pass
+def f() -> None: pass # E: Name 'f' already defined
+
 
 -- Special cases
 -- -------------

mypy/test/data/check-overloading.test

@@ -91,12 +91,6 @@ class A:
   def f(self, x: 'B') -> 'B': pass
 class B: pass
 
-[case testNonConsecutiveOverloads]
-from typing import Any
-def f() -> None: pass
-def g() -> None: pass
-def f(x: Any) -> None: pass # E: Name 'f' already defined (overload variants must be next to each other)
-
 [case testOverloadsWithDifferentArgumentCounts]
 from typing import overload
 a, b = None, None # type: (A, B)