Show More
@@ -1,7 +1,7 b'' | |||
|
1 | 1 | # -*- coding: utf-8 -*- |
|
2 | 2 | """Magic functions for InteractiveShell. |
|
3 | 3 | |
|
4 |
$Id: Magic.py 191 |
|
|
4 | $Id: Magic.py 1921 2006-11-21 20:49:55Z vivainio $""" | |
|
5 | 5 | |
|
6 | 6 | #***************************************************************************** |
|
7 | 7 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and |
@@ -36,11 +36,16 b' from cStringIO import StringIO' | |||
|
36 | 36 | from getopt import getopt,GetoptError |
|
37 | 37 | from pprint import pprint, pformat |
|
38 | 38 | |
|
39 | # profile isn't bundled by default in Debian for license reasons | |
|
39 | # cProfile was added in Python2.5 | |
|
40 | 40 | try: |
|
41 |
import profile |
|
|
41 | import cProfile as profile | |
|
42 | import pstats | |
|
42 | 43 | except ImportError: |
|
43 | profile = pstats = None | |
|
44 | # profile isn't bundled by default in Debian for license reasons | |
|
45 | try: | |
|
46 | import profile,pstats | |
|
47 | except ImportError: | |
|
48 | profile = pstats = None | |
|
44 | 49 | |
|
45 | 50 | # Homebrewed |
|
46 | 51 | import IPython |
@@ -1,3 +1,4 b'' | |||
|
1 | ||
|
1 | 2 | 2006-11-21 Ville Vainio <vivainio@gmail.com> |
|
2 | 3 | |
|
3 | 4 | * upgrade_dir.py: Now actually overwrites a nonmodified user file |
@@ -10,6 +11,20 b'' | |||
|
10 | 11 | of os.path.join, expansion of 'foo' was broken on win32 |
|
11 | 12 | if there was one directory with name 'foobar'. |
|
12 | 13 | |
|
14 | * A bunch of patches from Kirill Smelkov: | |
|
15 | ||
|
16 | * [patch 9/9] doc: point bug-tracker URL to IPythons trac-tickets. | |
|
17 | ||
|
18 | * [patch 7/9] Implement %page -r (page in raw mode) - | |
|
19 | ||
|
20 | * [patch 5/9] ScientificPython webpage has moved | |
|
21 | ||
|
22 | * [patch 4/9] The manual mentions %ds, should be %dhist | |
|
23 | ||
|
24 | * [patch 3/9] Kill old bits from %prun doc. | |
|
25 | ||
|
26 | * [patch 1/9] Fix typos here and there. | |
|
27 | ||
|
13 | 28 | 2006-11-08 Ville Vainio <vivainio@gmail.com> |
|
14 | 29 | |
|
15 | 30 | * completer.py (attr_matches): catch all exceptions raised |
@@ -438,11 +438,15 b' Profiler support.' | |||
|
438 | 438 | profile.run() |
|
439 | 439 | \family default |
|
440 | 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 | 446 | \family typewriter |
|
443 | 447 | profile |
|
444 | 448 | \family default |
|
445 | module, IPython wraps this functionality with magic commands (see | |
|
449 | modules, IPython wraps this functionality with magic commands (see | |
|
446 | 450 | \family typewriter |
|
447 | 451 | `%prun' |
|
448 | 452 | \family default |
General Comments 0
You need to be logged in to leave comments.
Login now