summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Script
diff options
context:
space:
mode:
authoranatoly techtonik <techtonik@gmail.com>2012-12-07 22:30:14 (GMT)
committeranatoly techtonik <techtonik@gmail.com>2012-12-07 22:30:14 (GMT)
commit0ee050e090f0acbb3909cf42822a8b86dbafc3c0 (patch)
tree622397d373c16dedbe0bb5e98af5c2ec15405d57 /src/engine/SCons/Script
parentfe91cb8242f03fd95187b7c25bde6614d491bc5e (diff)
downloadSCons-0ee050e090f0acbb3909cf42822a8b86dbafc3c0.zip
SCons-0ee050e090f0acbb3909cf42822a8b86dbafc3c0.tar.gz
SCons-0ee050e090f0acbb3909cf42822a8b86dbafc3c0.tar.bz2
Removed some pre-Python 2.4 compatibility code
Diffstat (limited to 'src/engine/SCons/Script')
-rw-r--r--src/engine/SCons/Script/SConscript.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py
index aa555da..bd515d2 100644
--- a/src/engine/SCons/Script/SConscript.py
+++ b/src/engine/SCons/Script/SConscript.py
@@ -473,13 +473,8 @@ class SConsEnvironment(SCons.Environment.Base):
def EnsurePythonVersion(self, major, minor):
"""Exit abnormally if the Python version is not late enough."""
- try:
- v_major, v_minor, v_micro, release, serial = sys.version_info
- python_ver = (v_major, v_minor)
- except AttributeError:
- python_ver = self._get_major_minor_revision(sys.version)[:2]
- if python_ver < (major, minor):
- v = sys.version.split(" ", 1)[0]
+ if sys.version_info < (major, minor):
+ v = sys.version.split()[0]
print "Python %d.%d or greater required, but you have Python %s" %(major,minor,v)
sys.exit(2)