From d99954715dd1161b2fc97cd44444a849fa54f536 2007-03-15 20:57:28
From: vivainio
Date: 2007-03-15 20:57:28
Subject: [PATCH] Applied Joergen's patch for %run completer quote mismatch exception, closing #127.
---
diff --git a/IPython/Extensions/ipy_stock_completers.py b/IPython/Extensions/ipy_stock_completers.py
index 56978d3..39e9857 100755
--- a/IPython/Extensions/ipy_stock_completers.py
+++ b/IPython/Extensions/ipy_stock_completers.py
@@ -164,12 +164,30 @@ def bzr_completer(self,event):
return bzr_commands.split()
ip.set_hook('complete_command', bzr_completer, str_key = 'bzr')
-
+
+def shlex_split(x):
+ """Helper function to split lines into segments."""
+ #shlex.split raise exception if syntax error in sh syntax
+ #for example if no closing " is found. This function keeps dropping
+ #the last character of the line until shlex.split does not raise
+ #exception. Adds end of the line to the result of shlex.split
+ #example: %run "c:/python -> ['%run','"c:/python']
+ endofline=[]
+ while x!="":
+ try:
+ comps=shlex.split(x)
+ if endofline>=1:
+ comps.append("".join(endofline))
+ return comps
+ except ValueError:
+ endofline=[x[-1:]]+endofline
+ x=x[:-1]
+ return ["".join(endofline)]
def runlistpy(self, event):
- comps = shlex.split(event.line)
- relpath = (len(comps) > 1 and comps[-1] or '')
-
+ comps = shlex_split(event.line)
+ relpath = (len(comps) > 1 and comps[-1] or '').strip("'\"")
+
#print "\nev=",event # dbg
#print "rp=",relpath # dbg
#print 'comps=',comps # dbg
diff --git a/doc/ChangeLog b/doc/ChangeLog
index b847ee1..49272db 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-15 Ville Vainio <vivainio@gmail.com>
+
+ * Extensions/ipy_stock_completers.py: Fixed exception
+ on mismatching quotes in %run completer. Patch by
+ J�rgen Stenarson. Closes #127.
+
2007-03-14 Ville Vainio <vivainio@gmail.com>
* Extensions/ext_rehashdir.py: Do not do auto_alias