From 5cb1ea0fac16c59171de798b98cfd79ae38de78c 2006-11-21 20:56:48
From: vivainio
Date: 2006-11-21 20:56:48
Subject: [PATCH] oops, revert failed application of patch 2/9
---

diff --git a/IPython/Magic.py b/IPython/Magic.py
index 9302f8f..6f2a838 100644
--- a/IPython/Magic.py
+++ b/IPython/Magic.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Magic functions for InteractiveShell.
 
-$Id: Magic.py 1921 2006-11-21 20:49:55Z vivainio $"""
+$Id: Magic.py 1922 2006-11-21 20:56:48Z vivainio $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
@@ -36,16 +36,11 @@ from cStringIO import StringIO
 from getopt import getopt,GetoptError
 from pprint import pprint, pformat
 
-# cProfile was added in Python2.5
+# profile isn't bundled by default in Debian for license reasons
 try:
-    import cProfile as profile
-    import pstats
+    import profile,pstats
 except ImportError:
-    # profile isn't bundled by default in Debian for license reasons
-    try:
-        import profile,pstats
-    except ImportError:
-        profile = pstats = None
+    profile = pstats = None
 
 # Homebrewed
 import IPython
diff --git a/doc/manual_base.lyx b/doc/manual_base.lyx
index 9758c7b..d93d1f9 100644
--- a/doc/manual_base.lyx
+++ b/doc/manual_base.lyx
@@ -438,15 +438,11 @@ Profiler support.
 profile.run()
 \family default 
 ) or complete programs under the profiler's control.
- While this is possible with standard 
-\family typewriter 
-cProfile
-\family default 
- or 
+ While this is possible with the standard 
 \family typewriter 
 profile
 \family default 
- modules, IPython wraps this functionality with magic commands (see 
+ module, IPython wraps this functionality with magic commands (see 
 \family typewriter 
 `%prun'
 \family default