summaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authoranatoly techtonik <techtonik@gmail.com>2012-12-08 01:30:14 +0300
committeranatoly techtonik <techtonik@gmail.com>2012-12-08 01:30:14 +0300
commit0c9217a6328a5fa64d04a5df229adb76be27f736 (patch)
tree622397d373c16dedbe0bb5e98af5c2ec15405d57 /src/script
parenta5ff23c20f1360d7e66e12ca18bd7be93f580a31 (diff)
downloadscons-0c9217a6328a5fa64d04a5df229adb76be27f736.tar.gz
Removed some pre-Python 2.4 compatibility code
Diffstat (limited to 'src/script')
-rw-r--r--src/script/scons.py18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/script/scons.py b/src/script/scons.py
index cd8b4323..46e6d2b6 100644
--- a/src/script/scons.py
+++ b/src/script/scons.py
@@ -55,18 +55,12 @@ import sys
# engine modules if they're in either directory.
-# Check to see if the python version is > 3.0 which is currently unsupported
-# If so exit with error message
-try:
- if sys.version_info >= (3,0,0):
- msg = "scons: *** SCons version %s does not run under Python version %s.\n\
-Python 3.0 and later are not yet supported.\n"
- sys.stderr.write(msg % (__version__, sys.version.split()[0]))
- sys.exit(1)
-except AttributeError:
- # Pre-1.6 Python has no sys.version_info
- # No need to check version as we then know the version is < 3.0.0 and supported
- pass
+if sys.version_info >= (3,0,0):
+ msg = "scons: *** SCons version %s does not run under Python version %s.\n\
+Python 3 is not yet supported.\n"
+ sys.stderr.write(msg % (__version__, sys.version.split()[0]))
+ sys.exit(1)
+
script_dir = sys.path[0]