From: GregNoel <GregNoel@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Tue, 9 Sep 2008 23:44:59 +0000 (+0000)
Subject: Issue 1913: use cProfile instead of profile if available
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f246341ddf36b3fe2955667a9058cd7988654aef;p=scons.git

Issue 1913: use cProfile instead of profile if available

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3380 fdb21ef1-2011-0410-befe-b5e4ea1792b1
---

diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index 96b18a48..4a4dd84f 100644
--- a/src/engine/SCons/Script/Main.py
+++ b/src/engine/SCons/Script/Main.py
@@ -1186,7 +1186,10 @@ def _exec_main(parser, values):
         import pdb
         pdb.Pdb().runcall(_main, parser)
     elif options.profile_file:
-        from profile import Profile
+        try:
+            from cProfile import Profile
+        except ImportError, e:
+            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