Really merge the changes from ingrid.

sebastinas · sebastinas · commit 14da675e60cd · 2012-09-15T17:45:41.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -666,6 +666,8 @@ def get_line(self):
         while True:
             key = self.get_key()
             if self.p_key(key) is None:
+                if self.config.cli_trim_prompts and self.s.startswith(">>> "):
+                    self.s = self.s[4:]
                 return self.s
 
     def home(self, refresh=True):
diff --git a/bpython/config.py b/bpython/config.py
@@ -91,6 +91,7 @@ def loadini(struct, configfile):
             'yank_from_buffer': 'C-y'},
         'cli': {
             'suggestion_width': 0.8,
+            'trim_prompts': False,
         },
         'gtk': {
             'font': 'monospace 10',
@@ -142,6 +143,8 @@ def loadini(struct, configfile):
 
     struct.cli_suggestion_width = config.getfloat('cli',
                                                   'suggestion_width')
+    struct.cli_trim_prompts = config.getboolean('cli',
+                                                  'trim_prompts')
 
     struct.complete_magic_methods = config.getboolean('general',
                                                       'complete_magic_methods')
diff --git a/doc/sphinx/source/configuration.rst b/doc/sphinx/source/configuration.rst
@@ -241,6 +241,12 @@ The width of the suggestion window in percent of the terminal width.
 
 .. versionadded:: 0.9.8
 
+trim_prompts
+^^^^^^^^^^^^
+Default: False
+
+Trims lines starting with '>>> ' when set to True.
+
 GTK
 ---
 This refers to the ``[gtk]`` section in your `$XDG_CONFIG_HOME/bpython/config` file.
