Remove checks for Python 3.x, x < 4.

QuLogic · QuLogic · commit 6d6098a1e1be · 2016-10-20T20:10:24.000-04:00
The requirement is 2.7 or 3.4+.
diff --git a/lib/matplotlib/compat/subprocess.py b/lib/matplotlib/compat/subprocess.py
@@ -17,7 +17,7 @@
 from __future__ import print_function
 import os
 import sys
-if os.name == 'posix' and sys.version_info[:2] < (3, 2):
+if os.name == 'posix' and sys.version_info[0] < 3:
     # work around for https://github.com/matplotlib/matplotlib/issues/5314
     try:
         import subprocess32 as subprocess
diff --git a/setupext.py b/setupext.py
@@ -17,7 +17,6 @@
 
 
 PY3min = (sys.version_info[0] >= 3)
-PY32min = (PY3min and sys.version_info[1] >= 2 or sys.version_info[0] > 3)
 
 
 def _get_home():
@@ -90,7 +89,7 @@ def _get_xdg_cache_dir():
 
 setup_cfg = os.environ.get('MPLSETUPCFG', 'setup.cfg')
 if os.path.exists(setup_cfg):
-    if PY32min:
+    if PY3min:
         config = configparser.ConfigParser()
     else:
         config = configparser.SafeConfigParser()
@@ -724,7 +723,7 @@ def check(self):
         except ImportError:
             msgs += [bad_nose]
 
-        if sys.version_info >= (3, 3):
+        if PY3min:
             msgs += ['using unittest.mock']
         else:
             try:
@@ -849,7 +848,7 @@ class Numpy(SetupPackage):
 
     @staticmethod
     def include_dirs_hook():
-        if sys.version_info[0] >= 3:
+        if PY3min:
             import builtins
             if hasattr(builtins, '__NUMPY_SETUP__'):
                 del builtins.__NUMPY_SETUP__
@@ -1047,11 +1046,11 @@ def do_custom_build(self):
                         pass
 
             if not os.path.isfile(tarball_path):
-
-                if sys.version_info[0] == 2:
-                    from urllib import urlretrieve
-                else:
+                if PY3min:
                     from urllib.request import urlretrieve
+                else:
+                    from urllib import urlretrieve
+
                 if not os.path.exists('build'):
                     os.makedirs('build')
 
@@ -1370,14 +1369,6 @@ def check(self):
         try:
             import dateutil
         except ImportError:
-            # dateutil 2.1 has a file encoding bug that breaks installation on
-            # python 3.3
-            # https://github.com/matplotlib/matplotlib/issues/2373
-            # hack around the problem by installing the (working) v2.0
-            major, minor1, _, _, _ = sys.version_info
-            if self.version is None and (major, minor1) == (3, 3):
-                self.version = '!=2.1'
-
             return (
                 "dateutil was not found. It is required for date axis "
                 "support. pip/easy_install may attempt to install it "
@@ -1396,7 +1387,7 @@ class FuncTools32(SetupPackage):
     name = "functools32"
 
     def check(self):
-        if sys.version_info[:2] < (3, 2):
+        if not PY3min:
             try:
                 import functools32
             except ImportError:
@@ -1409,7 +1400,7 @@ def check(self):
             return "Not required"
 
     def get_install_requires(self):
-        if sys.version_info[:2] < (3, 2):
+        if not PY3min:
             return ['functools32']
         else:
             return []
@@ -1419,7 +1410,7 @@ class Subprocess32(SetupPackage):
     name = "subprocess32"
 
     def check(self):
-        if sys.version_info[:2] < (3, 2):
+        if not PY3min:
             try:
                 import subprocess32
             except ImportError:
@@ -1433,7 +1424,7 @@ def check(self):
             return "Not required"
 
     def get_install_requires(self):
-        if sys.version_info[:2] < (3, 2) and os.name == 'posix':
+        if not PY3min and os.name == 'posix':
             return ['subprocess32']
         else:
             return []
