Merge

IPython/Extensions/ipy_completers.py

@@ -331,7 +331,29 b' def cd_completer(self, event):'
         if os.path.isdir(relpath):
             return [relpath]
         raise IPython.ipapi.TryNext
-    return found
+
+
+    def single_dir_expand(matches):
+        "Recursively expand match lists containing a single dir."
+        
+        if len(matches) == 1 and os.path.isdir(matches[0]):
+            # Takes care of links to directories also.  Use '/'
+            # explicitly, even under Windows, so that name completions
+            # don't end up escaped.
+            d = matches[0]
+            if d[-1] in ['/','\\']:
+                d = d[:-1]
+
+            subdirs = [p for p in os.listdir(d) if os.path.isdir( d + '/' + p)]
+            if subdirs:
+                matches = [ (d + '/' + p) for p in subdirs ]
+                return single_dir_expand(matches)
+            else:
+                return matches
+        else:
+            return matches
+
+    return single_dir_expand(found)
 
 def apt_get_packages(prefix):
     out = os.popen('apt-cache pkgnames')

IPython/Magic.py

@@ -3148,13 +3148,13 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 or diff files. 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 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'.
         This assigns the pasted block to variable 'foo' as string, without 
-        dedenting or executing it.
+        dedenting or executing it (preceding >>> and + is still stripped)
         
         Do not be alarmed by garbled output on Windows (it's a readline bug). 
         Just press enter and type -- (and press enter again) and the block 
@@ -3167,7 +3167,7 b' Defaulting color scheme to \'NoColor\'"""'
         sentinel = opts.get('s','--')
 
         strip_from_start = [re.compile(e) for e in 
-                            ['^(.?>)+','^In \[\d+\]:','^\++']]         
+                            [r'^\s*(\s?>)+',r'^\s*In \[\d+\]:',r'^\++']]         
         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 = '109'
+revision = '117'
 branch = 'ipython'
 
 if branch == 'ipython':
@@ -30,6 +30,8 b" if branch == 'ipython':"
 else:
     version = '0.8.3.bzr.r%s.%s'  % (revision,branch)
 
+version = '0.8.3'
+
 description = "An enhanced interactive Python shell."
 
 long_description = \

IPython/genutils.py

@@ -22,7 +22,10 b' __license__ = Release.license'
 # required modules from the Python standard library
 import __main__
 import commands
+try:
 import doctest
+except ImportError:
+    pass
 import os
 import re
 import shlex

IPython/iplib.py

@@ -702,7 +702,10 b' class InteractiveShell(object,Magic):'
 
         # Do a proper resetting of doctest, including the necessary displayhook
         # monkeypatching
+        try:
         doctest_reload()
+        except ImportError:
+            warn("doctest module does not exist.")
         
         # Set user colors (don't do it in the constructor above so that it
         # doesn't crash if colors option is invalid)

IPython/ipmaker.py

@@ -103,9 +103,12 b' def make_IPython(argv=None,user_ns=None,user_global_ns=None,debug=1,'
                      embedded=embedded,**kw)
 
     # Put 'help' in the user namespace
+    try:
     from site import _Helper
-    IP.user_config_ns = {}
     IP.user_ns['help'] = _Helper()
+    except ImportError:
+        warn('help() not available - check site.py')
+    IP.user_config_ns = {}
 
 
     if DEVDEBUG:

doc/ChangeLog

@@ -1,3 +1,14 b''
[phone]  Ville Vainio <[e-mail]>
+
+	* iplib.py, ipmaker.py: survive lack of doctest and site._Helper
+	for minimal environments (e.g. Maemo sdk python)
+
+	* Magic.py: cpaste strips whitespace before >>> (allow pasting
+	doctests)
+
+	* ipy_completers.py: cd completer now does recursive path expand
+	(old behaviour is buggy on some readline versions)
+
 2008-05-14  Ville Vainio <[e-mail]>
 
 	* Extensions/ipy_greedycompleter.py: 

scripts/ipython_win_post_install.py

@@ -60,11 +60,11 b' def install():'
     mkshortcut(python,'IPython scipy profile',f,a)
 
     # Create documentation shortcuts ...    
-    t = prefix + r'\share\doc\ipython-%s\manual.pdf' % version
+    t = prefix + r'\share\doc\ipython\manual\ipython.pdf'
     f = ip_dir + r'\Manual in PDF.lnk'
     mkshortcut(t,r'IPython Manual - PDF-Format',f)
 
-    t = prefix + r'\share\doc\ipython-%s\manual\manual.html' % version
+    t = prefix + r'\share\doc\ipython\manual\ipython.html'
     f = ip_dir + r'\Manual in HTML.lnk'
     mkshortcut(t,'IPython Manual - HTML-Format',f)
 

test/test_cpaste.ipy

@@ -3,7 +3,8 b''
 tests = {'pass': ["> > > run()",
                   ">>> > run()",
                   "+++ run()",
-                  "++ run()"],
+                  "++ run()",
+		  "  >>> run()"],
 
          'fail': ["+ + run()",
                   " ++ run()"]}

tools/make_tarball.py

@@ -1,5 +1,6 b''
 import os,sys,shutil
 
+
 basever = '0.8.3'
 
 def oscmd(c):
@@ -19,7 +20,7 b' def verinfo():'
 basename = 'ipython'
 
 #tarname = '%s.r%s.tgz' % (basename, ver)
-oscmd('update_revnum.py')
+oscmd('python update_revnum.py')
 
 ver = verinfo()
 

tools/mkrel.py

@@ -26,14 +26,25 b" if os.path.isdir('dist'):"
 if os.path.isdir(ipykit_name):
     distutils.dir_util.remove_tree(ipykit_name)
 
+if sys.platform == 'win32':
 c("python exesetup.py py2exe")
 
 os.rename('dist',ipykit_name)
 
 c("zip -r %s.zip %s" % (ipykit_name, ipykit_name))
 
+# Build source and binary distros
+c('./setup.py sdist --formats=gztar')
+
+c("python2.4 ./setup.py bdist_rpm --binary-only --release=py24 --python=/usr/bin/python2.4")
+c("python2.5 ./setup.py bdist_rpm --binary-only --release=py25 --python=/usr/bin/python2.5")
+
+# Build eggs
+c('python2.4 ./eggsetup.py bdist_egg')
+c('python2.5 ./eggsetup.py bdist_egg')
+
 c("python setup.py bdist_wininst --install-script=ipython_win_post_install.py")
 
-os.chdir("dist")
-#c("svn export http://ipython.scipy.org/svn/ipython/ipython/trunk ipython")
-#c("zip -r ipython_svn.zip ipython")
+os.chdir('tools')
+c('python make_tarball.py')
+