Show More
| @@ -43,20 +43,14 b' class LineInfo(object):' | |||||
| 43 | Everything else on the line. |
|
43 | Everything else on the line. | |
| 44 | """ |
|
44 | """ | |
| 45 | def __init__(self, line, continue_prompt): |
|
45 | def __init__(self, line, continue_prompt): | |
| 46 | self.ip = IPython.ipapi.get() |
|
|||
| 47 | self.line = line |
|
46 | self.line = line | |
| 48 | self.continue_prompt = continue_prompt |
|
47 | self.continue_prompt = continue_prompt | |
| 49 | self.pre, self.iFun, self.theRest = splitUserInput(line) |
|
48 | self.pre, self.iFun, self.theRest = splitUserInput(line) | |
| 50 |
|
49 | |||
| 51 | self.preChar = self.pre.strip() |
|
50 | self.preChar = self.pre.strip() | |
| 52 |
|
||||
| 53 | # special override for !, which MUST always have top priority |
|
|||
| 54 | if not self.preChar and self.iFun.startswith(self.ip.IP.ESC_SHELL): |
|
|||
| 55 | self.preChar = self.pre = self.ip.IP.ESC_SHELL |
|
|||
| 56 | self.iFun = self.iFun[1:] |
|
|||
| 57 | if self.preChar: |
|
51 | if self.preChar: | |
| 58 | self.preWhitespace = '' # No whitespace allowd before esc chars |
|
52 | self.preWhitespace = '' # No whitespace allowd before esc chars | |
| 59 | else: |
|
53 | else: | |
| 60 | self.preWhitespace = self.pre |
|
54 | self.preWhitespace = self.pre | |
| 61 |
|
55 | |||
| 62 | self._oinfo = None |
|
56 | self._oinfo = None | |
| @@ -77,11 +71,6 b' class LineInfo(object):' | |||||
| 77 | if not self._oinfo: |
|
71 | if not self._oinfo: | |
| 78 | self._oinfo = ip._ofind(self.iFun) |
|
72 | self._oinfo = ip._ofind(self.iFun) | |
| 79 | return self._oinfo |
|
73 | return self._oinfo | |
| 80 | def __str__(self): |
|
|||
| 81 | return "Lineinfo [%s|%s|%s]" %(self.pre,self.iFun,self.theRest) |
|
|||
| 82 |
|
||||
| 83 |
|
||||
| 84 |
|
||||
| 85 |
|
74 | |||
| 86 |
|
75 | |||
| 87 | def splitUserInput(line, pattern=None): |
|
76 | def splitUserInput(line, pattern=None): | |
General Comments 0
You need to be logged in to leave comments.
Login now