Show More
@@ -6,7 +6,7 b' Requires Python 2.3 or newer.' | |||||
6 |
|
6 | |||
7 | This file contains all the classes and helper functions specific to IPython. |
|
7 | This file contains all the classes and helper functions specific to IPython. | |
8 |
|
8 | |||
9 |
$Id: iplib.py 212 |
|
9 | $Id: iplib.py 2126 2007-03-02 06:51:02Z fperez $ | |
10 | """ |
|
10 | """ | |
11 |
|
11 | |||
12 | #***************************************************************************** |
|
12 | #***************************************************************************** | |
@@ -2020,12 +2020,30 b' want to merge them back into the new files.""" % locals()' | |||||
2020 | return '' |
|
2020 | return '' | |
2021 | else: |
|
2021 | else: | |
2022 | return lineout |
|
2022 | return lineout | |
2023 |
|
2023 | |||
2024 | def split_user_input(self,line): |
|
2024 | def split_user_input(self,line): | |
2025 | """Split user input into pre-char, function part and rest.""" |
|
2025 | """Split user input into pre-char, function part and rest.""" | |
2026 |
|
2026 | |||
2027 | lsplit = self.line_split.match(line) |
|
2027 | lsplit = self.line_split.match(line) | |
2028 | if lsplit is None: # no regexp match returns None |
|
2028 | if lsplit is None: # no regexp match returns None | |
|
2029 | try: | |||
|
2030 | iFun,theRest = line.split(None,1) | |||
|
2031 | except ValueError: | |||
|
2032 | iFun,theRest = line,'' | |||
|
2033 | pre = re.match('^(\s*)(.*)',line).groups()[0] | |||
|
2034 | else: | |||
|
2035 | pre,iFun,theRest = lsplit.groups() | |||
|
2036 | ||||
|
2037 | #print 'line:<%s>' % line # dbg | |||
|
2038 | #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun.strip(),theRest) # dbg | |||
|
2039 | return pre,iFun.strip(),theRest | |||
|
2040 | ||||
|
2041 | ||||
|
2042 | def split_user_inputTMP(self,line): | |||
|
2043 | """Split user input into pre-char, function part and rest.""" | |||
|
2044 | ||||
|
2045 | lsplit = self.line_split.match(line) | |||
|
2046 | if lsplit is None: # no regexp match returns None | |||
2029 | lsplit = self.line_split_fallback.match(line) |
|
2047 | lsplit = self.line_split_fallback.match(line) | |
2030 |
|
2048 | |||
2031 | #pre,iFun,theRest = lsplit.groups() # dbg |
|
2049 | #pre,iFun,theRest = lsplit.groups() # dbg |
@@ -1,3 +1,10 b'' | |||||
|
1 | 2007-03-01 Fernando Perez <Fernando.Perez@colorado.edu> | |||
|
2 | ||||
|
3 | * IPython/iplib.py (split_user_inputBROKEN): temporarily disable | |||
|
4 | my changes from yesterday, they introduced bugs. Will reactivate | |||
|
5 | once I get a correct solution, which will be much easier thanks to | |||
|
6 | Dan Milstein's new prefilter test suite. | |||
|
7 | ||||
1 | 2007-02-28 Fernando Perez <Fernando.Perez@colorado.edu> |
|
8 | 2007-02-28 Fernando Perez <Fernando.Perez@colorado.edu> | |
2 |
|
9 | |||
3 | * IPython/iplib.py (split_user_input): fix input splitting so we |
|
10 | * IPython/iplib.py (split_user_input): fix input splitting so we |
General Comments 0
You need to be logged in to leave comments.
Login now