[Python-checkins] cpython (3.4): remove 2.2 and 2.6 compat code (closes #22200)

[benjamin.peterson]

http://hg.python.org/cpython/rev/fbb51251eb9d
changeset:   92145:fbb51251eb9d
branch:      3.4
parent:      92136:b05d4f3ee190
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Aug 17 23:00:42 2014 -0500
summary:
  remove 2.2 and 2.6 compat code (closes #22200)

Patch from Thomas Kluyver.

files:
  Lib/distutils/command/install.py |  35 +++++--------------
  1 files changed, 10 insertions(+), 25 deletions(-)


diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
@@ -15,32 +15,17 @@
 from distutils.util import get_platform
 from distutils.errors import DistutilsOptionError
 
-# this keeps compatibility from 2.3 to 2.5
-if sys.version < "2.6":
-    USER_BASE = None
-    USER_SITE = None
-    HAS_USER_SITE = False
-else:
-    from site import USER_BASE
-    from site import USER_SITE
-    HAS_USER_SITE = True
+from site import USER_BASE
+from site import USER_SITE
+HAS_USER_SITE = True
 
-if sys.version < "2.2":
-    WINDOWS_SCHEME = {
-        'purelib': '$base',
-        'platlib': '$base',
-        'headers': '$base/Include/$dist_name',
-        'scripts': '$base/Scripts',
-        'data'   : '$base',
-    }
-else:
-    WINDOWS_SCHEME = {
-        'purelib': '$base/Lib/site-packages',
-        'platlib': '$base/Lib/site-packages',
-        'headers': '$base/Include/$dist_name',
-        'scripts': '$base/Scripts',
-        'data'   : '$base',
-    }
+WINDOWS_SCHEME = {
+    'purelib': '$base/Lib/site-packages',
+    'platlib': '$base/Lib/site-packages',
+    'headers': '$base/Include/$dist_name',
+    'scripts': '$base/Scripts',
+    'data'   : '$base',
+}
 
 INSTALL_SCHEMES = {
     'unix_prefix': {

-- 
Repository URL: http://hg.python.org/cpython