##// END OF EJS Templates
oops, revert failed application of patch 2/9
vivainio -
Show More
@@ -1,7 +1,7 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 """Magic functions for InteractiveShell.
2 """Magic functions for InteractiveShell.
3
3
4 $Id: Magic.py 1921 2006-11-21 20:49:55Z vivainio $"""
4 $Id: Magic.py 1922 2006-11-21 20:56:48Z vivainio $"""
5
5
6 #*****************************************************************************
6 #*****************************************************************************
7 # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
7 # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
@@ -36,16 +36,11 b' from cStringIO import StringIO'
36 from getopt import getopt,GetoptError
36 from getopt import getopt,GetoptError
37 from pprint import pprint, pformat
37 from pprint import pprint, pformat
38
38
39 # cProfile was added in Python2.5
39 # profile isn't bundled by default in Debian for license reasons
40 try:
40 try:
41 import cProfile as profile
41 import profile,pstats
42 import pstats
43 except ImportError:
42 except ImportError:
44 # profile isn't bundled by default in Debian for license reasons
43 profile = pstats = None
45 try:
46 import profile,pstats
47 except ImportError:
48 profile = pstats = None
49
44
50 # Homebrewed
45 # Homebrewed
51 import IPython
46 import IPython
@@ -438,15 +438,11 b' Profiler support.'
438 profile.run()
438 profile.run()
439 \family default
439 \family default
440 ) or complete programs under the profiler's control.
440 ) or complete programs under the profiler's control.
441 While this is possible with standard
441 While this is possible with the standard
442 \family typewriter
443 cProfile
444 \family default
445 or
446 \family typewriter
442 \family typewriter
447 profile
443 profile
448 \family default
444 \family default
449 modules, IPython wraps this functionality with magic commands (see
445 module, IPython wraps this functionality with magic commands (see
450 \family typewriter
446 \family typewriter
451 `%prun'
447 `%prun'
452 \family default
448 \family default
General Comments 0
You need to be logged in to leave comments. Login now