Removed mentioning Python 2.4.

pypa · Sep 1, 2012 · a6d6ed7 · a6d6ed7
1 parent 39a369b
commit a6d6ed7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/setup.py b/setup.py
@@ -71,7 +71,6 @@ def get_version():
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.4',
         'Programming Language :: Python :: 2.5',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',

diff --git a/virtualenv.py b/virtualenv.py
@@ -21,17 +21,13 @@
 import distutils.sysconfig
 from distutils.util import strtobool
 import struct
+import subprocess
+
+if sys.version_info < (2, 5):
+    print('ERROR: %s' % sys.exc_info()[1])
+    print('ERROR: this script requires Python 2.5 or greater.')
+    sys.exit(101)
 
-try:
-    import subprocess
-except ImportError:
-    if sys.version_info <= (2, 3):
-        print('ERROR: %s' % sys.exc_info()[1])
-        print('ERROR: this script requires Python 2.4 or greater; or at least the subprocess module.')
-        print('If you copy subprocess.py from a newer version of Python this script will probably work')
-        sys.exit(101)
-    else:
-        raise
 try:
     set
 except NameError: