Revert "Merge with mypy master"

This reverts commit d49292d.

Author: quartox

.travis.yml

@@ -15,7 +15,6 @@ python:
 
 install:
   - pip install -r test-requirements.txt
-  - python2 -m pip install --user typing
   - python setup.py install
 
 script:

LICENSE

@@ -27,7 +27,8 @@ DEALINGS IN THE SOFTWARE.
 = = = = =
 
 Portions of mypy are licensed under different licenses.  The files
-under stdlib-samples are licensed under the PSF 2 License, reproduced below.
+under stdlib-samples and lib-typing are licensed under the PSF 2
+License, reproduced below.
 
 = = = = =
 

ROADMAP.md

@@ -149,18 +149,6 @@ When you're puzzled or when things are complicated
    reveal_type(c)  # -> error: Revealed type is 'builtins.list[builtins.str]'
    print(c)  # -> [4] the object is not cast
 
-   # if you want dynamic attributes on your class, have it override __setattr__ or __getattr__
-   # in a stub or in your source code.
-   # __setattr__ allows for dynamic assignment to names
-   # __getattr__ allows for dynamic access to names
-   class A:
-       # this will allow assignment to any A.x, if x is the same type as `value`
-       def __setattr__(self, name, value):
-           # type: (str, int) -> None
-           ...
-   a.foo = 42  # works
-   a.bar = 'Ex-parrot'  # fails type checking
-
    # TODO: explain "Need type annotation for variable" when
    # initializing with None or an empty container
 

docs/source/cheat_sheet.rst

@@ -142,19 +142,6 @@ When you're puzzled or when things are complicated
    reveal_type(c)  # -> error: Revealed type is 'builtins.list[builtins.str]'
    print(c)  # -> [4] the object is not cast
 
-   # if you want dynamic attributes on your class, have it override __setattr__ or __getattr__
-   # in a stub or in your source code.
-   # __setattr__ allows for dynamic assignment to names
-   # __getattr__ allows for dynamic access to names
-   class A:
-       # this will allow assignment to any A.x, if x is the same type as `value`
-       def __setattr__(self, name: str, value: int) -> None: ...
-       # this will allow access to any A.x, if x is compatible with the return type
-       def __getattr__(self, name: str) -> int: ...
-   a.foo = 42  # works
-   a.bar = 'Ex-parrot'  # fails type checking
-
-
    # TODO: explain "Need type annotation for variable" when
    # initializing with None or an empty container
 

docs/source/cheat_sheet_py3.rst

@@ -180,7 +180,7 @@ not support ``sort()``) as a list and sort it in-place:
         # Type of x is List[int] here.
         x.sort()  # Okay!
 
-.. _variance:
+.. _invariance-vs-covariance:
 
 Invariance vs covariance
 ------------------------

docs/source/common_issues.rst

@@ -178,8 +178,6 @@ overridden by the pattern sections matching the module name.
 - ``strict_boolean`` (Boolean, default False) makes using non-boolean
   expressions in conditions an error.
 
-- ``no_implicit_optional`` (Boolean, default false) changes the treatment of
-  arguments with a default value of None by not implicitly making their type Optional
 
 Example
 *******

docs/source/config_file.rst

@@ -31,7 +31,7 @@ List of major changes:
 
     * Add :ref:`variance-of-generics`.
 
-    * Add :ref:`variance`.
+    * Add :ref:`invariance-vs-covariance`.
 
     * Updates to :ref:`python-36`.
 

docs/source/revision_history.rst

@@ -4,7 +4,7 @@
 
 from distutils.core import setup
 
-version = '0.3.0-dev'
+version = '0.2.0'
 description = 'Experimental type system extensions for programs checked with the mypy typechecker.'
 long_description = '''
 Mypy Extensions

extensions/setup.py

@@ -0,0 +1,14 @@
+"""Module for testing the behavior of generics across different modules."""
+
+from typing import TypeVar, Generic
+
+T = TypeVar('T')
+
+
+class A(Generic[T]):
+    pass
+
+
+class B(Generic[T]):
+    class A(Generic[T]):
+        pass