Merge pull request #4730 from takluyver/i4728

Fix stripping continuation prompts when copying from Qt console
ipython · Dec 22, 2013 · 65981cb · 65981cb
2 parents d929163 + 113961b
commit 65981cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/IPython/core/inputtransformer.py b/IPython/core/inputtransformer.py
@@ -453,8 +453,7 @@ def classic_prompt():
 def ipy_prompt():
     """Strip IPython's In [1]:/...: prompts."""
     # FIXME: non-capturing version (?:...) usable?
-    # FIXME: r'^(In \[\d+\]: | {3}\.{3,}: )' clearer?
-    prompt_re = re.compile(r'^(In \[\d+\]: |\ \ \ \.\.\.+: )')
+    prompt_re = re.compile(r'^(In \[\d+\]: |\ {3,}\.{3,}: )')
     return _strip_prompts(prompt_re)
 
 

diff --git a/IPython/core/tests/test_inputtransformer.py b/IPython/core/tests/test_inputtransformer.py
@@ -206,6 +206,11 @@ def transform_checker(tests, transformer, **kwargs):
           ('   ....:     print i','    print i'),
           ('   ....: ', ''),
           ],
+         [('In [24]: for i in range(10):','for i in range(10):'),
+          # Qt console prompts expand with spaces, not dots
+          ('    ...:     print i','    print i'),
+          ('    ...: ', ''),
+          ],
          [('In [2]: a="""','a="""'),
           ('   ...: 123"""','123"""'),
           ],