Merge pull request #3495 from lebigot/master

Simplified regexp, and suggestions for clearer regexps.

IPython/core/inputtransformer.py

@@ -381,13 +381,16 b' def _strip_prompts(prompt_re):'
 @CoroutineInputTransformer.wrap
 def classic_prompt():
     """Strip the >>>/... prompts of the Python interactive shell."""
-    prompt_re = re.compile(r'^(>>> ?|^\.\.\. ?)')
+    # FIXME: non-capturing version (?:...) usable?
+    prompt_re = re.compile(r'^(>>> ?|\.\.\. ?)')
     return _strip_prompts(prompt_re)
 
 @CoroutineInputTransformer.wrap
 def ipy_prompt():
     """Strip IPython's In [1]:/...: prompts."""
-    prompt_re = re.compile(r'^(In \[\d+\]: |^\ \ \ \.\.\.+: )')
+    # FIXME: non-capturing version (?:...) usable?
+    # FIXME: r'^(In \[\d+\]: | {3}\.{3,}: )' clearer?
+    prompt_re = re.compile(r'^(In \[\d+\]: |\ \ \ \.\.\.+: )')
     return _strip_prompts(prompt_re)