Don't hardcode prompt.

Trundle · Trundle · commit 614b659aa617 · 2010-11-18T10:27:27.000+01:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -944,15 +944,15 @@ def print_line(self, s, clr=False, newline=False):
     def prompt(self, more):
         """Show the appropriate Python prompt"""
         if not more:
-            self.echo("\x01%s\x03>>> " % (self.config.color_scheme['prompt'],))
-            self.stdout_hist += '>>> '
-            self.s_hist.append('\x01%s\x03>>> \x04' %
-                               (self.config.color_scheme['prompt'],))
+            self.echo("\x01%s\x03%s" % (self.config.color_scheme['prompt'], self.ps1))
+            self.stdout_hist += self.ps1
+            self.s_hist.append('\x01%s\x03%s\x04' %
+                               (self.config.color_scheme['prompt'], self.ps1))
         else:
             prompt_more_color = self.config.color_scheme['prompt_more']
-            self.echo("\x01%s\x03... " % (prompt_more_color, ))
-            self.stdout_hist += '... '
-            self.s_hist.append('\x01%s\x03... \x04' % (prompt_more_color, ))
+            self.echo("\x01%s\x03%s" % (prompt_more_color, self.ps2))
+            self.stdout_hist += self.ps2
+            self.s_hist.append('\x01%s\x03%s\x04' % (prompt_more_color, self.ps2))
 
     def push(self, s, insert_into_history=True):
         # curses.raw(True) prevents C-c from causing a SIGINT
@@ -1041,7 +1041,8 @@ def reprint_line(self, lineno, tokens):
         if real_lineno < 0:
             return
 
-        self.scr.move(real_lineno, 4)
+        self.scr.move(real_lineno,
+                      len(self.ps1) if lineno == 0 else len(self.ps2))
         line = format(tokens, BPythonFormatter(self.config.color_scheme))
         for string in line.split('\x04'):
             self.echo(string)
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -672,13 +672,13 @@ def prompt(self, more):
         Show the appropriate Python prompt.
         """
         if more:
-            text = '... '
+            text = self.ps2
         else:
-            text = '>>> '
+            text = self.ps1
         with self.editing:
             iter_ = self.get_cursor_iter()
             self.text_buffer.insert_with_tags_by_name(iter_, text, 'prompt')
-        iter_.forward_chars(4)
+        iter_.forward_chars(len(text))
         mark = self.text_buffer.create_mark('line_start', iter_, True)
         self.text_buffer.place_cursor(iter_)
         self.scroll_to_mark(mark, 0.2)
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -340,6 +340,8 @@ def __init__(self, interp, config):
         self._C = {}
         self.prev_block_finished = 0
         self.interact = Interaction(self.config)
+        self.ps1 = 'spam> '
+        self.ps2 = '... '
         # previous pastebin content to prevent duplicate pastes, filled on call
         # to repl.pastebin
         self.prev_pastebin_content = ''
@@ -668,8 +670,10 @@ def formatforfile(self, s):
 
         def process():
             for line in s.split('\n'):
-                if line.startswith('>>>') or line.startswith('...'):
-                    yield line[4:]
+                if line.startswith(self.ps1):
+                    yield line[len(self.ps1):]
+                elif line.startswith(self.ps2):
+                    yield line[len(self.ps2):]
                 elif line.rstrip():
                     yield "# OUT: %s" % (line,)
         return "\n".join(process())
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -745,12 +745,12 @@ def prompt(self, more):
         # XXX what is s_hist?
         if not more:
             self.edit = BPythonEdit(self.config,
-                                    caption=('prompt', '>>> '))
-            self.stdout_hist += '>>> '
+                                    caption=('prompt', self.ps1))
+            self.stdout_hist += self.ps1
         else:
             self.edit = BPythonEdit(self.config,
-                                    caption=('prompt_more', '... '))
-            self.stdout_hist += '... '
+                                    caption=('prompt_more', self.ps2))
+            self.stdout_hist += self.ps2
 
         urwid.connect_signal(self.edit, 'change', self.on_input_change)
         urwid.connect_signal(self.edit, 'edit-pos-changed',
