Merge pull request #11278 from Carreau/cleanup-doctest

Remove Python 2 shim.

IPython/testing/plugin/test_ipdoctest.py

@@ -6,25 +6,22 b' a doctest) and which have no test functionality of their own, should be called'
 empty function call is counted as a test, which just inflates tests numbers
 artificially).
 """
-from IPython.utils.py3compat import doctest_refactor_print
 
-@doctest_refactor_print
 def doctest_simple():
     """ipdoctest must handle simple inputs
     
     In [1]: 1
     Out[1]: 1
 
-    In [2]: print 1
+    In [2]: print(1)
     1
     """
 
-@doctest_refactor_print
 def doctest_multiline1():
     """The ipdoctest machinery must handle multiline examples gracefully.
 
     In [2]: for i in range(4):
-       ...:     print i
+       ...:     print(i)
        ...:      
     0
     1
@@ -32,7 +29,6 b' def doctest_multiline1():'
     3
     """
 
-@doctest_refactor_print
 def doctest_multiline2():
     """Multiline examples that define functions and print output.
 
@@ -44,7 +40,7 b' def doctest_multiline2():'
     Out[8]: 2
 
     In [9]: def g(x):
-       ...:     print 'x is:',x
+       ...:     print('x is:',x)
        ...:      
 
     In [10]: g(1)

IPython/utils/py3compat.py

@@ -193,14 +193,6 b' def _print_statement_sub(match):'
     expr = match.groups('expr')
     return "print(%s)" % expr
 
-@_modify_str_or_docstring
-def doctest_refactor_print(doc):
-    """Refactor 'print x' statements in a doctest to print(x) style. 2to3
-    unfortunately doesn't pick up on our doctests.
-
-    Can accept a string or a function, so it can be used as a decorator."""
-    return _print_statement_re.sub(_print_statement_sub, doc)
-
 # Abstract u'abc' syntax:
 @_modify_str_or_docstring
 def u_format(s):