merge all from 0.7.3 branch to trunk

IPython/Extensions/jobctrl.py

@@ -21,7 +21,7 README_Windows.txt
 """                     
 
 from subprocess import Popen,PIPE
-import os
+import os,shlex
 
 from IPython import genutils
 
@@ -38,7 +38,7 class IpyPopen(Popen):
         os.system('taskkill /PID %d' % self.pid)
                   
 def startjob(job):
-    p = IpyPopen(job, stdout=PIPE, shell = False)
+    p = IpyPopen(shlex.split(job), stdout=PIPE, shell = False)
     p.line = job
     return p
 

IPython/Release.py

@@ -1,7 +1,7
 # -*- coding: utf-8 -*-
 """Release data for the IPython project.
 
-$Id: Release.py 1976 2006-12-08 11:53:57Z vivainio $"""
+$Id: Release.py 2010 2006-12-20 15:29:17Z vivainio $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2006 Fernando Perez <[e-mail]>
@@ -22,12 +22,11 name = 'ipython'
 # because bdist_rpm does not accept dashes (an RPM) convention, and
 # bdist_deb does not accept underscores (a Debian convention).
 
-revision = '1975'
+revision = '2007'
 
-#version = '0.7.3.svn' 
-
-version = '0.7.3b3.r' + revision.rstrip('M')
+version = '0.7.3'
 
+#version = '0.7.3rc2.r' + revision.rstrip('M')
 
 description = "An enhanced interactive Python shell."
 

IPython/usage.py

@@ -6,7 +6,7
 #  the file COPYING, distributed as part of this software.
 #*****************************************************************************
 
-# $Id: usage.py 1332 2006-05-30 01:41:28Z fperez $
+# $Id: usage.py 2010 2006-12-20 15:29:17Z vivainio $
 
 from IPython import Release
 __author__  = '%s <%s>' % Release.authors['Fernando']
@@ -623,7 +623,8 cd /usr/share : Obvious, also 'cd d:\home\_ipython' works
 History:
 
 _i, _ii, _iii    : Previous, next previous, next next previous input
-_ih[4], _ih[2:5] : Input history line 4, lines 2-4
+_i4, _ih[2:5]    : Input history line 4, lines 2-4
+exec _i81        : Execute input history line #81 again
 _, __, ___       : previous, next previous, next next previous output
 _dh              : Directory history
 _oh              : Output history

doc/ChangeLog

@@ -1,3 +1,32
[phone]  Ville Vainio  <[e-mail]>
+
+	* 0.7.3 is out - merge all from 0.7.3 branch to trunk
+
[phone]  Ville Vainio  <[e-mail]>
+
+	* Extensions/jobctrl.py: Fixed &cmd arg arg... 
+	to work properly on posix too
+	
+	* Release.py: Update revnum (version is still just 0.7.3).
+
[phone]  Ville Vainio  <[e-mail]>
+
+	* scripts/ipython_win_post_install: create ipython.py in
+	prefix + "/scripts".
+	
+	* Release.py: Update version to 0.7.3.
+    
[phone]  Ville Vainio  <[e-mail]>
+
+	* scripts/ipython_win_post_install: Overwrite old shortcuts
+	if they already exist
+
+	* Release.py: release 0.7.3rc2
+    
[phone]  Ville Vainio  <[e-mail]>
+
+	* Branch and update Release.py for 0.7.3rc1
+
 2006-12-13  Fernando Perez  <[e-mail]>
 
 	* IPython/Shell.py (IPShellWX): update for current WX naming

scripts/ipython_win_post_install.py

@@ -1,12 +1,11
 #!python
 """Windows-specific part of the installation"""
 
-import os, sys
+import os, sys, shutil
 
-def create_shortcut_safe(target,description,link_file,*args,**kw):
+def mkshortcut(target,description,link_file,*args,**kw):
     """make a shortcut if it doesn't exist, and register its creation"""
     
-    if not os.path.isfile(link_file):
         create_shortcut(target, description, link_file,*args,**kw)
         file_created(link_file)
 
@@ -49,20 +48,23 def install():
     # Create program shortcuts ...
     f = ip_dir + r'\IPython.lnk'
     a = prefix + r'\scripts\ipython'
-    create_shortcut_safe(python,'IPython',f,a)
+    mkshortcut(python,'IPython',f,a)
 
     f = ip_dir + r'\pysh.lnk'
-    a = prefix + r'\scripts\ipython -p pysh'
-    create_shortcut_safe(python,'pysh',f,a)
+    a = prefix + r'\scripts\ipython -p sh'
+    mkshortcut(python,'IPython command prompt mode',f,a)
 
     # Create documentation shortcuts ...    
     t = prefix + r'\share\doc\ipython-%s\manual.pdf' % version
     f = ip_dir + r'\Manual in PDF.lnk'
-    create_shortcut_safe(t,r'IPython Manual - PDF-Format',f)
+    mkshortcut(t,r'IPython Manual - PDF-Format',f)
 
     t = prefix + r'\share\doc\ipython-%s\manual\manual.html' % version
     f = ip_dir + r'\Manual in HTML.lnk'
-    create_shortcut_safe(t,'IPython Manual - HTML-Format',f)
+    mkshortcut(t,'IPython Manual - HTML-Format',f)
+
+    # make ipython.py
+    shutil.copy(prefix + r'\scripts\ipython', prefix + r'\scripts\ipython.py')
 
 def remove():
     """Routine to be run by the win32 installer with the -remove switch."""

tools/make_tarball.py

@@ -1,6 +1,6
 import os,sys,shutil
 
-repo = "http://ipython.scipy.org/svn/ipython/ipython/trunk"
+repo = "http://ipython.scipy.org/svn/ipython/ipython/branches/0.7.3"
 basename = 'ipython'
 workdir = './mkdist'