- Fix tab-completion so that quotes are not closed unless the completion is

unambiguous.

- Small cleanups in ipy_stock_completers.

IPython/Extensions/ipy_stock_completers.py

@@ -95,11 +95,14 b' def runlistpy(self, event):'
     comps = shlex.split(event.line)
     relpath = (len(comps) > 1 and comps[-1] or '')
    
-    print "rp",relpath
+    #print "rp",relpath  # dbg
+    glob = glob.glob
+    isdir = os.path.isdir
     if relpath.startswith('~'):
         relpath = os.path.expanduser(relpath)
-    dirs = [f.replace('\\','/') + "/" for f in  glob.glob(relpath+'*') if os.path.isdir(f)]
-    pys =  [f.replace('\\','/') for f in  glob.glob(relpath+'*.py')]
+    dirs = [f.replace('\\','/') + "/" for f in glob(relpath+'*')
+            if isdir(f)]
+    pys =  [f.replace('\\','/') for f in glob(relpath+'*.py')]
     return dirs + pys
 
 ip.set_hook('complete_command', runlistpy, str_key = '%run')

IPython/completer.py

@@ -406,7 +406,9 b' class IPCompleter(Completer):'
             # Takes care of links to directories also.  Use '/'
             # explicitly, even under Windows, so that name completions
             # don't end up escaped.
-            matches[0] += '/'
+            pjoin = os.path.join
+            d = matches[0]
+            matches = [ pjoin(d,p) for p in os.listdir(d) ]
         return matches
 
     def alias_matches(self, text):

doc/ChangeLog

@@ -1,3 +1,10 b''
[phone]  Fernando Perez  <[e-mail]>
+
+	* IPython/completer.py (IPCompleter.file_matches): Fix
+	tab-completion so that quotes are not closed unless the completion
+	is unambiguous.  After a request by Stefan.  Minor cleanups in
+	ipy_stock_completers.
+
 2006-11-02  Ville Vainio  <[e-mail]>
 
 	* ipy_stock_completers.py: Add %run and %cd completers.