Merge branch 'master' into asyncgen

Author: JelleZijlstra

README.md

@@ -83,7 +83,8 @@ If you want to run the latest version of the code, you can install from git:
 
 
 Now, if Python on your system is configured properly (else see
-"Troubleshooting" below), you can type-check a program like this:
+"Troubleshooting" below), you can type-check the [statically typed parts] of a
+program like this:
 
     $ mypy PROGRAM
 
@@ -92,6 +93,8 @@ programs, even if they have type errors:
 
     $ python3 PROGRAM
 
+[statically typed parts]: http://mypy.readthedocs.io/en/latest/basics.html#function-signatures
+
 
 Web site and documentation
 --------------------------

appveyor.yml

@@ -26,7 +26,6 @@ install:
 build: off
 
 test_script:
-    # Ignore lint (it's run separately below), reports (since we don't have lxml),
-    # and cmdline (since one of its tests depend on lxml)
-    - "%PYTHON%\\python.exe runtests.py -x lint -x reports -x cmdline"
+    # Ignore lint (it's run separately below)
+    - "%PYTHON%\\python.exe runtests.py -x lint"
     - ps: if ($env:PYTHON_VERSION -Match "3.6.x" -And $env:PYTHON_ARCH -Match "64") { iex "$env:PYTHON\\python.exe -m flake8" }

docs/source/command_line.rst

@@ -16,17 +16,17 @@ flag (or its long form ``--help``)::
               [--warn-incomplete-stub] [--warn-redundant-casts]
               [--warn-no-return] [--warn-unused-ignores] [--show-error-context]
               [--fast-parser] [-i] [--cache-dir DIR] [--strict-optional]
-              [--strict-optional-whitelist [GLOB [GLOB ...]]]
+              [--strict-optional-whitelist [GLOB [GLOB ...]]] [--strict]
               [--junit-xml JUNIT_XML] [--pdb] [--show-traceback] [--stats]
               [--inferstats] [--custom-typing MODULE]
               [--custom-typeshed-dir DIR] [--scripts-are-modules]
               [--config-file CONFIG_FILE] [--show-column-numbers]
-              [--find-occurrences CLASS.MEMBER] [--cobertura-xml-report DIR]
-              [--html-report DIR] [--linecount-report DIR]
-              [--linecoverage-report DIR] [--memory-xml-report DIR]
-              [--old-html-report DIR] [--txt-report DIR] [--xml-report DIR]
-              [--xslt-html-report DIR] [--xslt-txt-report DIR] [-m MODULE]
-              [-c PROGRAM_TEXT] [-p PACKAGE]
+              [--find-occurrences CLASS.MEMBER] [--strict-boolean]
+              [--cobertura-xml-report DIR] [--html-report DIR]
+              [--linecount-report DIR] [--linecoverage-report DIR]
+              [--memory-xml-report DIR] [--old-html-report DIR]
+              [--txt-report DIR] [--xml-report DIR] [--xslt-html-report DIR]
+              [--xslt-txt-report DIR] [-m MODULE] [-c PROGRAM_TEXT] [-p PACKAGE]
               [files [files ...]]
 
   (etc., too long to show everything here)
@@ -345,9 +345,9 @@ Here are some more useful flags:
 
 - ``--config-file CONFIG_FILE`` causes configuration settings to be
   read from the given file.  By default settings are read from ``mypy.ini``
-  in the current directory.  Settings override mypy's built-in defaults
-  and command line flags can override settings.  See :ref:`config-file`
-  for the syntax of configuration files.
+  or ``setup.cfg`` in the current directory.  Settings override mypy's
+  built-in defaults and command line flags can override settings.
+  See :ref:`config-file` for the syntax of configuration files.
 
 - ``--junit-xml JUNIT_XML`` will make mypy generate a JUnit XML test
   result document with type checking results. This can make it easier
@@ -366,6 +366,17 @@ Here are some more useful flags:
   also currently ignores functions with an empty body or a body that is
   just ellipsis (``...``), since these can be valid as abstract methods.
 
+- ``--warn-return-any`` causes mypy to generate a warning when returning a value
+  with type ``Any`` from a function declared with a non- ``Any`` return type.
+
+- ``--strict-boolean`` will make using non-boolean expressions in conditions
+  an error. This means ``if x`` and ``while x`` are disallowed when ``x`` has any
+  type other than ``bool``. Instead use explicit checks like ``if x > 0`` or
+  ``while x is not None``.
+
+- ``--strict`` mode enables all optional error checking flags.  You can see the
+  list of flags enabled by strict mode in the full ``mypy -h`` output.
+
 For the remaining flags you can read the full ``mypy -h`` output.
 
 .. note::
@@ -378,20 +389,21 @@ Integrating mypy into another Python application
 ************************************************
 
 It is possible to integrate mypy into another Python 3 application by
-importing ``mypy.api`` and calling the ``run`` function with exactly the string
-you would have passed to mypy from the command line.
+importing ``mypy.api`` and calling the ``run`` function with a parameter of type ``List[str]``, containing
+what normally would have been the command line arguments to mypy.
 
-Function ``run`` returns a tuple of strings:
-``(<normal_report>, <error_report>)``, in which ``<normal_report>`` is what mypy
-normally writes to ``sys.stdout`` and ``<error_report>`` is what mypy normally
-writes to ``sys.stderr``.
+Function ``run`` returns a ``Tuple[str, str, int]``, namely
+``(<normal_report>, <error_report>, <exit_status>)``, in which ``<normal_report>``
+is what mypy normally writes to ``sys.stdout``, ``<error_report>`` is what mypy
+normally writes to ``sys.stderr`` and ``exit_status`` is the exit status mypy normally
+returns to the operating system.
 
-A trivial example of this is the following::
+A trivial example of using the api is the following::
 
     import sys
     from mypy import api
 
-    result = api.run(' '.join(sys.argv[1:]))
+    result = api.run(sys.argv[1:])
 
     if result[0]:
         print('\nType checking report:\n')
@@ -400,3 +412,5 @@ A trivial example of this is the following::
     if result[1]:
         print('\nError report:\n')
         print(result[1])  # stderr
+
+    print ('\nExit status:', result[2])

docs/source/config_file.rst

@@ -4,9 +4,16 @@ The mypy configuration file
 ===========================
 
 Mypy supports reading configuration settings from a file.  By default
-it uses the file ``mypy.ini`` in the current directory; the
-``--config-file`` command-line flag can be used to read a different
-file instead (see :ref:`--config-file <config-file-flag>`).
+it uses the file ``mypy.ini`` (with fallback to ``setup.cfg``) in the
+current directory; the ``--config-file`` command-line flag can be used to
+read a different file instead (see :ref:`--config-file <config-file-flag>`).
+
+It is important to understand that there is no merging of configuration
+files, as it would lead to ambiguity.  The ``--config-file`` flag
+has the highest precedence and must be correct; otherwise mypy will report
+an error and exit.  Without command line option, mypy will look for defaults,
+but will use only one of them.  The first one to read is ``mypy.ini``,
+and then ``setup.cfg``.
 
 Most flags correspond closely to :ref:`command-line flags
 <command-line>` but there are some differences in flag names and some
@@ -19,7 +26,7 @@ settings of the form `NAME = VALUE`.  Comments start with ``#``
 characters.
 
 - A section named ``[mypy]`` must be present.  This specifies
-  the global flags.
+  the global flags. The ``setup.cfg`` file is an exception to this.
 
 - Additional sections named ``[mypy-PATTERN1,PATTERN2,...]`` may be
   present, where ``PATTERN1``, ``PATTERN2`` etc. are `fnmatch patterns
@@ -161,6 +168,11 @@ overridden by the pattern sections matching the module name.
 - ``warn_no_return`` (Boolean, default False) shows errors for
   missing return statements on some execution paths.
 
+- ``warn_return_any`` (Boolean, default False) shows a warning when
+  returning a value with type ``Any`` from a function declared with a
+  non- ``Any`` return type.
+
+
 Example
 *******
 

lib-typing/2.7/mod_generics_cache.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