Drop support for Python 3.3 (#5248)

srittau · gvanrossum · commit 5f8e8007f3ff · 2018-06-20T09:43:47.000-07:00
See also python/typeshed#2258 and python/typeshed#2260.
diff --git a/extensions/setup.py b/extensions/setup.py
@@ -20,7 +20,6 @@
     'Programming Language :: Python :: 2',
     'Programming Language :: Python :: 2.7',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
diff --git a/mypy/build.py b/mypy/build.py
@@ -385,7 +385,7 @@ def default_lib_path(data_dir: str,
     else:
         # For Python 2, we only have stubs for 2.7
         versions = ["2.7"]
-    # E.g. for Python 3.5, try 3.5/, 3.4/, 3.3/, 3/, 2and3/.
+    # E.g. for Python 3.6, try 3.6/, 3.5/, 3.4/, 3/, 2and3/.
     for v in versions + [str(pyversion[0]), '2and3']:
         for lib_type in ['stdlib', 'third_party']:
             stubdir = os.path.join(typeshed_dir, lib_type, v)
diff --git a/mypy/defaults.py b/mypy/defaults.py
@@ -1,6 +1,6 @@
 PYTHON2_VERSION = (2, 7)
 PYTHON3_VERSION = (3, 6)
-PYTHON3_VERSION_MIN = (3, 3)
+PYTHON3_VERSION_MIN = (3, 4)
 CACHE_DIR = '.mypy_cache'
 CONFIG_FILE = 'mypy.ini'
 SHARED_CONFIG_FILES = ('setup.cfg',)
diff --git a/runtests.py b/runtests.py
@@ -12,14 +12,15 @@
 
 
 def get_versions() -> List[str]:
+    # generates list of python versions to use.
+    # For Python2, this is only [2.7].
+    # Otherwise, it is [3.x, ..., 3.1, 3.0], where x is the version
+    # of the running interpreter.
     major = sys.version_info[0]
     minor = sys.version_info[1]
     if major == 2:
         return ['2.7']
     else:
-        # generates list of python versions to use.
-        # For Python2, this is only [2.7].
-        # Otherwise, it is [3.4, 3.3, 3.2, 3.1, 3.0].
         return ['%d.%d' % (major, i) for i in range(minor, -1, -1)]
 
 
@@ -175,7 +176,7 @@ def add_stubs(driver: Driver) -> None:
 
     modules = {'typing'}
     # TODO: This should also test Python 2, and pass pyversion accordingly.
-    for version in ["2and3", "3", "3.3", "3.4", "3.5"]:
+    for version in ["2and3", "3", "3.5"]:
         for stub_type in ['builtins', 'stdlib', 'third_party']:
             stubdir = join('typeshed', stub_type, version)
             for f in find_files(stubdir, suffix='.pyi'):
diff --git a/scripts/stubtest.py b/scripts/stubtest.py
@@ -17,10 +17,7 @@
 
 import dumpmodule
 
-if sys.version_info < (3, 4):
-    from singledispatch import singledispatch
-else:
-    from functools import singledispatch
+from functools import singledispatch
 
 # TODO: email.contentmanager has a symbol table with a None node.
 #       This seems like it should not be.
diff --git a/test-data/unit/cmdline.test b/test-data/unit/cmdline.test
@@ -508,13 +508,13 @@ python_version = 2.6
 mypy.ini: [mypy]: python_version: Python 2.6 is not supported (must be 2.7)
 == Return code: 0
 
-[case testPythonVersionTooOld32]
+[case testPythonVersionTooOld33]
 # cmd: mypy -c pass
 [file mypy.ini]
 [[mypy]
-python_version = 3.2
+python_version = 3.3
 [out]
-mypy.ini: [mypy]: python_version: Python 3.2 is not supported (must be 3.3 or higher)
+mypy.ini: [mypy]: python_version: Python 3.3 is not supported (must be 3.4 or higher)
 == Return code: 0
 
 [case testPythonVersionTooNew28]
@@ -542,11 +542,11 @@ mypy.ini: [mypy]: python_version: Python major version '4' out of range (must be
 python_version = 2.7
 [out]
 
-[case testPythonVersionAccepted33]
+[case testPythonVersionAccepted34]
 # cmd: mypy -c pass
 [file mypy.ini]
 [[mypy]
-python_version = 3.3
+python_version = 3.4
 [out]
 
 [case testPythonVersionAccepted36]
