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 192 |
|
4 | $Id: Magic.py 1927 2006-11-24 15:37:21Z 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,6 +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 | |||
|
40 | try: | |||
|
41 | import cProfile as profile | |||
|
42 | import pstats | |||
|
43 | except ImportError: | |||
39 | # profile isn't bundled by default in Debian for license reasons |
|
44 | # profile isn't bundled by default in Debian for license reasons | |
40 | try: |
|
45 | try: | |
41 | import profile,pstats |
|
46 | import profile,pstats |
@@ -438,11 +438,15 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 |
|
441 | While this is possible with standard | |
|
442 | \family typewriter | |||
|
443 | cProfile | |||
|
444 | \family default | |||
|
445 | or | |||
442 | \family typewriter |
|
446 | \family typewriter | |
443 | profile |
|
447 | profile | |
444 | \family default |
|
448 | \family default | |
445 | module, IPython wraps this functionality with magic commands (see |
|
449 | modules, IPython wraps this functionality with magic commands (see | |
446 | \family typewriter |
|
450 | \family typewriter | |
447 | `%prun' |
|
451 | `%prun' | |
448 | \family default |
|
452 | \family default |
General Comments 0
You need to be logged in to leave comments.
Login now