Mercurial > cpython-lru_cache-weakref
diff Lib/idlelib/PyShell.py @ 26827:13d59dbfb8d4 legacy-trunk
M EditorWindow.py
M PyShell.py
1. PyShell Rev 1.39, EditorWindow Rev 1.37 fix was not handling a
multiline prompt.
2. The same fix introduced a bug where hitting <enter> at a previous
prompt-only line would copy the prompt to the iomark.
3. Move the setting of sys.ps1 earlier, into PyShell.main(), to allow
this code to work before a shell is started up.
4. If cursor is on the input line in the prompt, and you hit <enter>,
process the line instead of complaining.
5. If line has no stdin range (this includes the last line before shell
restart) strip any prompt before recalling.
| author | Kurt B. Kaiser <kbk@shore.net> |
|---|---|
| date | Sun, 29 Dec 2002 22:03:38 +0000 |
| parents | 143922a40fac |
| children | b8c72e86a12d |
line wrap: on
line diff
--- a/Lib/idlelib/PyShell.py Sun Dec 29 20:14:11 2002 +0000 +++ b/Lib/idlelib/PyShell.py Sun Dec 29 22:03:38 2002 +0000 @@ -825,10 +825,6 @@ self.write("Python %s on %s\n%s\nIDLEfork %s\n" % (sys.version, sys.platform, self.COPYRIGHT, idlever.IDLE_VERSION)) - try: - sys.ps1 - except AttributeError: - sys.ps1 = ">>> " self.showprompt() import Tkinter Tkinter._default_root = None @@ -943,14 +939,17 @@ if next and self.text.compare("insert lineend", ">=", next[0]): self.recall(self.text.get(next[0], next[1])) return "break" - # No stdin mark -- just get the current line - self.recall(self.text.get("insert linestart", "insert lineend")) + # No stdin mark -- just get the current line, less any prompt + line = self.text.get("insert linestart", "insert lineend") + last_line_of_prompt = sys.ps1.split('\n')[-1] + if line.startswith(last_line_of_prompt): + line = line[len(last_line_of_prompt):] + self.recall(line) return "break" # If we're between the beginning of the line and the iomark, i.e. - # in the prompt area, complain. + # in the prompt area, move to the end of the prompt if self.text.compare("insert", "<", "iomark"): - self.text.bell() - return "break" + self.text.mark_set("insert", "iomark") # If we're in the current input and there's only whitespace # beyond the cursor, erase that whitespace first s = self.text.get("insert", "end-1c") @@ -1136,6 +1135,10 @@ script = None startup = False try: + sys.ps1 + except AttributeError: + sys.ps1 = '>>> ' + try: opts, args = getopt.getopt(sys.argv[1:], "c:deihr:st:") except getopt.error, msg: sys.stderr.write("Error: %s\n" % str(msg))