integrate fernandos 0.8.3 release changes to original trunk

IPython/Magic.py

@@ -3140,7 +3140,7 b' Defaulting color scheme to \'NoColor\'"""'
              screen_lines=self.shell.rc.screen_length)
 
     def magic_cpaste(self, parameter_s=''):
-        """Allows you to paste & execute a pre-formatted code block from clipboard
+        """Allows you to paste & execute a pre-formatted code block from clipboard.
         
         You must terminate the block with '--' (two minus-signs) alone on the
         line. You can also provide your own sentinel with '%paste -s %%' ('%%' 
@@ -3148,8 +3148,9 b' Defaulting color scheme to \'NoColor\'"""'
         
         The block is dedented prior to execution to enable execution of method
         definitions. '>' and '+' characters at the beginning of a line are
-        ignored, to allow pasting directly from e-mails, diff files and doctests. 
-        The executed block is also assigned to variable named 'pasted_block' for
+        ignored, to allow pasting directly from e-mails, diff files and
+        doctests (the '...' continuation prompt is also stripped).  The
+        executed block is also assigned to variable named 'pasted_block' for
         later editing with '%edit pasted_block'.
         
         You can also pass a variable name as an argument, e.g. '%cpaste foo'.
@@ -3166,8 +3167,15 b' Defaulting color scheme to \'NoColor\'"""'
         par = args.strip()
         sentinel = opts.get('s','--')
 
-        strip_from_start = [re.compile(e) for e in 
-                            [r'^\s*(\s?>)+',r'^\s*In \[\d+\]:',r'^\++']]         
+        # Regular expressions that declare text we strip from the input:
+        strip_re =  [r'^\s*In \[\d+\]:', # IPython input prompt
+                     r'^\s*(\s?>)+', # Python input prompt
+                     r'^\s*\.{3,}', # Continuation prompts
+                     r'^\++',
+                     ]
+
+        strip_from_start = map(re.compile,strip_re)
+        
         from IPython import iplib
         lines = []
         print "Pasting code; enter '%s' alone on the line to stop." % sentinel

IPython/Release.py

@@ -22,7 +22,7 b" name = 'ipython'"
 # because bdist_rpm does not accept dashes (an RPM) convention, and
 # bdist_deb does not accept underscores (a Debian convention).
 
-revision = '117'
+revision = '85'
 branch = 'ipython'
 
 if branch == 'ipython':

IPython/ultraTB.py

@@ -377,8 +377,8 b' class ListTB(TBTools):'
         
     def __call__(self, etype, value, elist):
         Term.cout.flush()
-        Term.cerr.flush()
         print >> Term.cerr, self.text(etype,value,elist)
+        Term.cerr.flush()
 
     def text(self,etype, value, elist,context=5):
         """Return a color formatted string with the traceback info."""
@@ -855,8 +855,8 b' class VerboseTB(TBTools):'
         (etype, evalue, etb) = info or sys.exc_info()
         self.tb = etb
         Term.cout.flush()
-        Term.cerr.flush()
         print >> Term.cerr, self.text(etype, evalue, etb)
+        Term.cerr.flush()
 
     # Changed so an instance can just be called as VerboseTB_inst() and print
     # out the right info on its own.
@@ -977,13 +977,13 b' class AutoFormattedTB(FormattedTB):'
         if out is None:
             out = Term.cerr
         Term.cout.flush()
-        out.flush()
         if tb_offset is not None:
             tb_offset, self.tb_offset = self.tb_offset, tb_offset
             print >> out, self.text(etype, evalue, etb)
             self.tb_offset = tb_offset
         else:
             print >> out, self.text(etype, evalue, etb)
+        out.flush()
         try:
             self.debugger()
         except KeyboardInterrupt:

MANIFEST.in

@@ -9,28 +9,23 b' graft setupext'
 graft IPython/UserConfig
 
 graft doc
+exclude doc/\#*
 exclude doc/*.1
-exclude doc/manual_base*
 exclude doc/ChangeLog.*
-exclude doc/\#*
-exclude doc/update_magic.sh
 exclude doc/update_version.sh
-exclude doc/manual_base*
-exclude doc/manual/WARNINGS
-exclude doc/manual/*.aux
-exclude doc/manual/*.log
-exclude doc/manual/*.out
-exclude doc/manual/*.pl
-exclude doc/manual/*.tex
+
+# There seems to be no way of excluding whole subdirectories, other than
+# manually excluding all their subdirs.  distutils really is horrible...
+exclude doc/attic/*
 exclude doc/build/doctrees/*
-exclude doc/build/latex/*
 exclude doc/build/html/_sources/*
-
-
-
+exclude doc/build/html/_static/*
+exclude doc/build/html/*
+exclude doc/build/latex/*
 
 global-exclude *~
 global-exclude *.flc
 global-exclude *.pyc
 global-exclude .dircopy.log
 global-exclude .svn
+global-exclude .bzr

doc/ChangeLog

@@ -1,3 +1,20 b''
[phone]  *** Released version 0.8.3
+
[phone]  Fernando Perez  <[e-mail]>
+
+	* ../win32_manual_post_install.py (run): Fix the windows installer
+	so the links to the docs are correct.
+
+	* IPython/ultraTB.py: flush stderr after writing to it to fix
+	problems with exception traceback ordering in some platforms.
+	Thanks to a report/fix by Jie Tang <jietang86-AT-gmail.com>.
+
+	* IPython/Magic.py (magic_cpaste): add stripping of continuation
+	prompts, feature requested by Stefan vdW.
+
+	* ../setup.py: updates to build and release tools in preparation
+	for 0.8.3 release.
+
 2008-05-27  Ville Vainio <[e-mail]>
 
 	* iplib.py, ipmaker.py: survive lack of doctest and site._Helper

doc/do_sphinx.py

@@ -1,3 +1,7 b''
+#!/usr/bin/env python
+"""Script to build documentation using Sphinx.
+"""
+
 import fileinput,os,sys
 
 def oscmd(c):
@@ -11,6 +15,7 b" if sys.platform != 'win32':"
     oscmd('sphinx-build -b latex -d build/doctrees source build/latex')
 
     # Produce pdf.
+    topdir = os.getcwd()
     os.chdir('build/latex')
 
     # Change chapter style to section style: allows chapters to start on 
@@ -60,5 +65,10 b" if sys.platform != 'win32':"
     oscmd('makeindex -s python.ist modipython.idx')
     oscmd('pdflatex ipython.tex')
     oscmd('pdflatex ipython.tex')
-    oscmd('cp ipython.pdf ../html')
-    os.chdir('../..')
+
+    # Create a manual/ directory with final html/pdf output
+    os.chdir(topdir)
+    oscmd('rm -rf manual')
+    oscmd('mkdir manual')
+    oscmd('cp -r build/html/*.html build/html/_static manual/')
+    oscmd('cp build/latex/ipython.pdf manual/')

setup.py

@@ -4,7 +4,7 b''
 
 Under Posix environments it works like a typical setup.py script. 
 Under Windows, the command sdist is not supported, since IPython 
-requires utilities, which are not available under Windows."""
+requires utilities which are not available under Windows."""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2005 Fernando Perez <[e-mail]>
@@ -18,15 +18,41 b' import os'
 import sys
 
 from glob import glob
+
+# BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
+# update it when the contents of directories change.
+if os.path.exists('MANIFEST'): os.remove('MANIFEST')
+
+from distutils.core import setup
 from setupext import install_data_ext
 
+# Local imports
+from IPython.genutils import target_update
+
 # A few handy globals
 isfile = os.path.isfile
 pjoin = os.path.join
 
-# BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
-# update it when the contents of directories change.
-if os.path.exists('MANIFEST'): os.remove('MANIFEST')
+##############################################################################
+# Utility functions
+def oscmd(s):
+    print ">", s
+    os.system(s)
+
+# A little utility we'll need below, since glob() does NOT allow you to do
+# exclusion on multiple endings!
+def file_doesnt_endwith(test,endings):
+    """Return true if test is a file and its name does NOT end with any
+    of the strings listed in endings."""
+    if not isfile(test):
+        return False
+    for e in endings:
+        if test.endswith(e):
+            return False
+    return True
+
+###############################################################################
+# Main code begins
 
 if os.name == 'posix':
     os_name = 'posix'
@@ -36,45 +62,45 b' else:'
     print 'Unsupported operating system:',os.name
     sys.exit(1)
 
-# Under Windows, 'sdist' is not supported, since it requires lyxport (and
-# hence lyx,perl,latex,pdflatex,latex2html,sh,...)
+# Under Windows, 'sdist' has not been supported.  Now that the docs build with
+# Sphinx it might work, but let's not turn it on until someone confirms that it
+# actually works.
 if os_name == 'windows' and 'sdist' in sys.argv:
     print 'The sdist command is not available under Windows.  Exiting.'
     sys.exit(1)
 
-from distutils.core import setup
-
 # update the manuals when building a source dist
 if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):
     import textwrap
-    from IPython.genutils import target_update
-    # list of things to be updated. Each entry is a triplet of args for
+
+    # List of things to be updated. Each entry is a triplet of args for
     # target_update()
-    
-    def oscmd(s):
-        print ">", s
-        os.system(s)
-        
-    oscmd("cd doc && python do_sphinx.py")
-    
-    oscmd("cd doc && gzip -9c ipython.1 > ipython.1.gz")
-    oscmd("cd doc && gzip -9c pycolor.1 > pycolor.1.gz")
+    to_update = [ # The do_sphinx scripts builds html and pdf, so just one
+                  # target is enough to cover all manual generation
+                 ('doc/manual/ipython.pdf',
+                  ['IPython/Release.py','doc/source/ipython.rst'],
+                  "cd doc && python do_sphinx.py" ),
+
+                  # FIXME - Disabled for now: we need to redo an automatic way
+                  # of generating the magic info inside the rst.                
+                  #('doc/magic.tex',
+                  #['IPython/Magic.py'],
+                  #"cd doc && ./update_magic.sh" ),
+                 
+                 ('doc/ipython.1.gz',
+                  ['doc/ipython.1'],
+                  "cd doc && gzip -9c ipython.1 > ipython.1.gz"),
+
+                 ('doc/pycolor.1.gz',
+                  ['doc/pycolor.1'],
+                  "cd doc && gzip -9c pycolor.1 > pycolor.1.gz"),
+                 ]
+
+    [ target_update(*t) for t in to_update ]
 
 # Release.py contains version, authors, license, url, keywords, etc.
 execfile(pjoin('IPython','Release.py'))
 
-# A little utility we'll need below, since glob() does NOT allow you to do
-# exclusion on multiple endings!
-def file_doesnt_endwith(test,endings):
-    """Return true if test is a file and its name does NOT end with any
-    of the strings listed in endings."""
-    if not isfile(test):
-        return False
-    for e in endings:
-        if test.endswith(e):
-            return False
-    return True
-
 # I can't find how to make distutils create a nested dir. structure, so
 # in the meantime do it manually. Butt ugly.
 # Note that http://www.redbrick.dcu.ie/~noel/distutils.html, ex. 2/3, contain
@@ -87,18 +113,15 b" manpagebase = 'share/man/man1'"
 # MANIFEST.in file.
 exclude     = ('.sh','.1.gz')
 docfiles    = filter(lambda f:file_doesnt_endwith(f,exclude),glob('doc/*'))
-
 examfiles   = filter(isfile, glob('doc/examples/*.py'))
-manfiles    = filter(isfile, glob('doc/build/html/*'))
-manstatic = filter(isfile, glob('doc/build/html/_static/*'))
-                     
-#            filter(isfile, glob('doc/manual/*.css')) + \
-#              filter(isfile, glob('doc/manual/*.png'))
-              
+manfiles    = filter(isfile, glob('doc/manual/*'))
+manstatic   = filter(isfile, glob('doc/manual/_static/*'))
 manpages    = filter(isfile, glob('doc/*.1.gz'))
+
 cfgfiles    = filter(isfile, glob('IPython/UserConfig/*'))
 scriptfiles = filter(isfile, ['scripts/ipython','scripts/pycolor',
                               'scripts/irunner'])
+
 igridhelpfiles = filter(isfile, glob('IPython/Extensions/igrid_help.*'))
 
 # Script to be run by the windows binary installer after the default setup
@@ -129,19 +152,15 b" if 'setuptools' in sys.modules:"
             ]}
         }
     scriptfiles = []
-    # eggs will lack docs, eaxmples
+    # eggs will lack docs, examples
     datafiles = []
-    
-    #datafiles = [('lib', 'IPython/UserConfig', cfgfiles)]
 else:
+    # Normal, non-setuptools install
     egg_extra_kwds = {}
     # package_data of setuptools was introduced to distutils in 2.4
     if sys.version_info < (2,4):
         datafiles.append(('lib', 'IPython/UserConfig', cfgfiles))
     
-    
-
-
 # Call the setup() routine which does most of the work
 setup(name             = name,
       version          = version,
@@ -154,7 +173,9 b' setup(name = name,'
       license          = license,
       platforms        = platforms,
       keywords         = keywords,
-      packages         = ['IPython', 'IPython.Extensions', 'IPython.external', 'IPython.gui', 'IPython.gui.wx', 'IPython.UserConfig'],
+      packages         = ['IPython', 'IPython.Extensions', 'IPython.external',
+                          'IPython.gui', 'IPython.gui.wx',
+                          'IPython.UserConfig'],
       scripts          = scriptfiles,
       package_data     = {'IPython.UserConfig' : ['*'] },
       

tools/make_tarball.py

@@ -1,5 +1,8 b''
-import os,sys,shutil
+#!/usr/bin/env python
+"""Simple script to create a tarball with proper bzr version info.
+"""
 
+import os,sys,shutil
 
 basever = '0.8.3'
 

tools/mkrel.py

@@ -1,11 +1,10 b''
-""" Create ipykit and exe installer
+#!/usr/bin/env python
+"""IPython release script
 
-requires py2exe
+Create ipykit and exe installer
 
+requires py2exe
 """
-#!/bin/sh
-# IPython release script
-
 
 import os
 import distutils.dir_util
@@ -19,7 +18,6 b' def c(cmd):'
 
 ipykit_name = "ipykit-%s" % version
 
-
 os.chdir('..')
 if os.path.isdir('dist'):
     distutils.dir_util.remove_tree('dist')

tools/release

@@ -4,6 +4,7 b''
 PYVER=`python -V 2>&1 | awk '{print $2}' | awk -F '.' '{print $1$2}' `
 version=`ipython -Version`
 ipdir=~/ipython/ipython
+ipbackupdir=~/ipython/backup
 
 echo
 echo "Releasing IPython version $version"
@@ -37,7 +38,8 b' rm -rf $ipdir/dist/*'
 
 # Perform local backup
 cd $ipdir/tools
-./bkp.sh
+./make_tarball.py
+mv ipython-*.tgz $ipbackupdir
 
 # Build source and binary distros
 cd $ipdir
@@ -50,8 +52,8 b' python2.4 ./setup.py bdist_rpm --binary-only --release=py24 --python=/usr/bin/py'
 python2.5 ./setup.py bdist_rpm --binary-only --release=py25 --python=/usr/bin/python2.5
 
 # Build eggs
-python2.4 ./eggsetup.py bdist_egg
-python2.5 ./eggsetup.py bdist_egg
+python2.4 ./setup_bdist_egg.py
+python2.5 ./setup_bdist_egg.py
 
 # Call the windows build separately, so that the extra Windows scripts don't
 # get pulled into Unix builds (setup.py has code which checks for
@@ -72,8 +74,8 b' echo "Uploading distribution files..."'
 scp * [e-mail]:www/dist/
 
 echo "Uploading backup files..."
-cd ~/ipython/backup
-scp `ls -1tr | tail -1` [e-mail]:www/backup/
+cd $ipbackupdir
+scp `ls -1tr *tgz | tail -1` [e-mail]:www/backup/
 
 echo "Updating webpage..."
 cd $ipdir/doc
@@ -86,8 +88,8 b' cd $www'
 
 # Alert package maintainers
 echo "Alerting package maintainers..."
-maintainers='[e-mail] [e-mail] [e-mail] [e-mail] [e-mail] [e-mail]'
-#maintainers='[e-mail]'
+#maintainers='[e-mail] [e-mail] [e-mail] [e-mail] [e-mail] [e-mail]'
+maintainers='[e-mail]'
 
 for email in $maintainers
     do

tools/testrel

@@ -2,13 +2,22 b''
 
 # release test
 
-cd ~/ipython/ipython
+ipdir=~/ipython/ipython
+ipbackupdir=~/ipython/backup
 
-# clean up build/dist directories
-rm -rf build/*
-rm -rf dist/*
+cd $ipdir
+
+# Clean up build/dist directories
+rm -rf $ipdir/build/*
+rm -rf $ipdir/dist/*
+
+# Perform local backup
+cd $ipdir/tools
+./make_tarball.py
+mv ipython-*.tgz $ipbackupdir
 
 # build source distros
+cd $ipdir
 ./setup.py sdist --formats=gztar
 
 # Build rpms
@@ -16,8 +25,8 b' python2.4 ./setup.py bdist_rpm --binary-only --release=py24 --python=/usr/bin/py'
 python2.5 ./setup.py bdist_rpm --binary-only --release=py25 --python=/usr/bin/python2.5
 
 # Build eggs
-python2.4 ./eggsetup.py bdist_egg
-python2.5 ./eggsetup.py bdist_egg
+python2.4 ./setup_bdist_egg.py
+python2.5 ./setup_bdist_egg.py
 
 # Call the windows build separately, so that the extra Windows scripts don't
 # get pulled into Unix builds (setup.py has code which checks for
@@ -25,4 +34,4 b' python2.5 ./eggsetup.py bdist_egg'
 ./setup.py bdist_wininst --install-script=ipython_win_post_install.py
 
 # Change name so retarded Vista runs the installer correctly
-rename 's/win32/win32-setup/' dist/*.exe
+rename 's/win32/win32-setup/' $ipdir/dist/*.exe

win32_manual_post_install.py

@@ -104,8 +104,8 b' def run(wait=0):'
         os.mkdir(ip_prog_dir)
     os.chdir(ip_prog_dir)
 
-    man_pdf = doc_dir + r'\manual.pdf'
-    man_htm = doc_dir + r'\manual\manual.html'
+    man_pdf = doc_dir + r'\manual\ipython.pdf'
+    man_htm = doc_dir + r'\manual\ipython.html'
 
     make_shortcut('IPython.lnk',sys.executable, '"%s"' % ip_filename,
                   my_documents_dir,