diff options
| -rw-r--r-- | src/engine/SCons/Script/Main.py | 8 | ||||
| -rw-r--r-- | src/engine/SCons/compat/__init__.py | 14 |
2 files changed, 18 insertions, 4 deletions
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index 9b8c94b..7909b0b 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -37,6 +37,8 @@ from __future__ import generators ### KEEP FOR COMPATIBILITY FIXERS __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" +import SCons.compat + import os import os.path import sys @@ -1226,10 +1228,8 @@ def _exec_main(parser, values): import pdb pdb.Pdb().runcall(_main, parser) elif options.profile_file: - try: - from cProfile import Profile - except ImportError, e: - from profile import Profile + # compat layer imports "cProfile" for us if it's available. + from profile import Profile # Some versions of Python 2.4 shipped a profiler that had the # wrong 'c_exception' entry in its dispatch table. Make sure diff --git a/src/engine/SCons/compat/__init__.py b/src/engine/SCons/compat/__init__.py index 7e93a71..4553d21 100644 --- a/src/engine/SCons/compat/__init__.py +++ b/src/engine/SCons/compat/__init__.py @@ -194,6 +194,20 @@ except AttributeError: try: + # Use the "imp" module to protect the import from fixers. + import imp + cProfile = imp.load_module('cProfile', *imp.find_module('cProfile')) +except ImportError: + # The "cProfile" module has already been eliminated in favor of + # having "import profile" import the fast version when available. + pass +else: + import sys + sys.modules['profile'] = cProfile + del cProfile + + +try: import platform except ImportError: # Pre-2.3 Python has no platform module. |