Fix test failures after rebase

Author: o11c

mypy/build.py

@@ -214,7 +214,8 @@ def default_lib_path(data_dir: str, target: int, pyversion: int,
     if pyversion == 2:
         major, minor = 2, 7
     else:
-        major, minor = sys.version_info[:2]
+        # See bug #886
+        major, minor = sys.version_info[0], sys.version_info[1]
     version_dir = '3.2'
     third_party_dir = 'third-party-3.2'
     if pyversion < 3:

mypy/myunit/__init__.py

@@ -6,7 +6,7 @@
 import time
 import traceback
 
-from typing import List, Tuple, Any, Callable, Union
+from typing import List, Tuple, Any, Callable, Union, cast
 
 
 # TODO remove global state
@@ -170,7 +170,7 @@ def add_suites_from_module(suites: List[Suite], mod_name: str) -> None:
     for suite in mod.__dict__.values():
         if isinstance(suite, type) and issubclass(suite, Suite) and suite is not Suite:
             got_suite = True
-            suites.append(suite())
+            suites.append(cast(Callable[[], Suite], suite)())
     if not got_suite:
         # Sanity check in case e.g. it uses unittest instead of a myunit.
         # The codecs tests do since they need to be python2-compatible.

mypy/nodes.py

@@ -71,7 +71,7 @@ def get_line(self) -> int: pass
 }
 
 reverse_type_aliases = dict((name.replace('__builtins__', 'builtins'), alias)
-                            for alias, name in type_aliases.items())
+                            for alias, name in type_aliases.items()) # type: Dict[str, str]
 
 
 class Node(Context):
@@ -1045,7 +1045,7 @@ def accept(self, visitor: NodeVisitor[T]) -> T:
     '>': '__gt__',
     '<=': '__le__',
     'in': '__contains__',
-}
+} # type: Dict[str, str]
 
 ops_with_inplace_method = {
     '+', '-', '*', '/', '%', '//', '**', '&', '|', '^', '<<', '>>'}

stubs/3.3/ipaddress.pyi

@@ -194,7 +194,6 @@ class IPv6Interface(IPv6Address):
 class IPv6Network(_BaseV6, _BaseNetwork):
     network_address = ... # type: Any
     netmask = ... # type: Any
-    hosts = ... # type: Any
     def __init__(self, address, strict=True): ...
     def hosts(self): ...
     @property