update changelog

IPython/Magic.py

@@ -1,7 +1,7 b''
 # -*- coding: utf-8 -*-
 """Magic functions for InteractiveShell.
 
-$Id: Magic.py 1918 2006-11-21 20:19:13Z vivainio $"""
+$Id: Magic.py 1921 2006-11-21 20:49:55Z vivainio $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001 Janko Hauser <[e-mail]> and
@@ -36,11 +36,16 b' from cStringIO import StringIO'
 from getopt import getopt,GetoptError
 from pprint import pprint, pformat
 
-# profile isn't bundled by default in Debian for license reasons
+# cProfile was added in Python2.5
 try:
-    import profile,pstats
+    import cProfile as profile
+    import pstats
 except ImportError:
-    profile = pstats = None
+    # profile isn't bundled by default in Debian for license reasons
+    try:
+        import profile,pstats
+    except ImportError:
+        profile = pstats = None
 
 # Homebrewed
 import IPython

doc/ChangeLog

@@ -1,3 +1,4 b''
+
 2006-11-21  Ville Vainio  <[e-mail]>
 
 	* upgrade_dir.py: Now actually overwrites a nonmodified user file
@@ -10,6 +11,20 b''
 	of os.path.join, expansion of 'foo' was broken on win32 
 	if there was one directory with name 'foobar'. 
 
+	* A bunch of patches from Kirill Smelkov:
+	
+	* [patch 9/9] doc: point bug-tracker URL to IPythons trac-tickets.
+
+	* [patch 7/9] Implement %page -r (page in raw mode) - 
+
+	* [patch 5/9] ScientificPython webpage has moved
+
+	* [patch 4/9] The manual mentions %ds, should be %dhist
+
+	* [patch 3/9] Kill old bits from %prun doc.
+
+	* [patch 1/9] Fix typos here and there.
+
 2006-11-08  Ville Vainio  <[e-mail]>
 
 	* completer.py (attr_matches): catch all exceptions raised 

doc/manual_base.lyx

@@ -438,11 +438,15 b' Profiler support.'
 profile.run()
 \family default 
 ) or complete programs under the profiler's control.
- While this is possible with the standard 
+ While this is possible with standard 
+\family typewriter 
+cProfile
+\family default 
+ or 
 \family typewriter 
 profile
 \family default 
- module, IPython wraps this functionality with magic commands (see 
+ modules, IPython wraps this functionality with magic commands (see 
 \family typewriter 
 `%prun'
 \family default