summaryrefslogtreecommitdiff
path: root/bootstrap.py
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2010-04-24 05:51:13 +0000
committerGreg Noel <GregNoel@tigris.org>2010-04-24 05:51:13 +0000
commit6a372812448d3462ac91d2c392f323b93df7e383 (patch)
treea4b9f900e52561a91e0c4509dc6c692492996b7f /bootstrap.py
parentf7ac1212e72b65e2840b9b116b962e3872e30e8e (diff)
downloadscons-6a372812448d3462ac91d2c392f323b93df7e383.tar.gz
http://scons.tigris.org/issues/show_bug.cgi?id=2345
Comb out all code that supported earlier versions of Python. Most such code is in snippets of only a few lines and can be identified by having a Python version string in it. Such snippets add up; this combing pass probably got rid of over 500 lines of code.
Diffstat (limited to 'bootstrap.py')
-rw-r--r--bootstrap.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/bootstrap.py b/bootstrap.py
index 37e8e707..a04dbc8f 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -79,11 +79,7 @@ executing it for the full build of all the packages, as specified in our
local SConstruct file.
"""
-try:
- script_dir = os.path.abspath(os.path.dirname(__file__))
-except NameError:
- # Pre-2.3 versions of Python don't have __file__.
- script_dir = os.path.abspath(os.path.dirname(sys.argv[0]))
+script_dir = os.path.abspath(os.path.dirname(__file__))
bootstrap_dir = os.path.join(script_dir, 'bootstrap')