From 468659656b0891b9cf2fb0ef993ef5e89eb756d7 2018-09-01 23:41:49
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: 2018-09-01 23:41:49
Subject: [PATCH] Remove Python 2 shim.

There was some recent bugs where doctests were not ran, so slowly
clearing and checking other doctest for later refactor

---

diff --git a/IPython/testing/plugin/test_ipdoctest.py b/IPython/testing/plugin/test_ipdoctest.py
index a7add7d..c14bc15 100644
--- a/IPython/testing/plugin/test_ipdoctest.py
+++ b/IPython/testing/plugin/test_ipdoctest.py
@@ -8,23 +8,21 @@ 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 +30,6 @@ def doctest_multiline1():
     3
     """
 
-@doctest_refactor_print
 def doctest_multiline2():
     """Multiline examples that define functions and print output.
 
@@ -44,7 +41,7 @@ def doctest_multiline2():
     Out[8]: 2
 
     In [9]: def g(x):
-       ...:     print 'x is:',x
+       ...:     print('x is:',x)
        ...:      
 
     In [10]: g(1)
diff --git a/IPython/utils/py3compat.py b/IPython/utils/py3compat.py
index 27a8276..e571665 100644
--- a/IPython/utils/py3compat.py
+++ b/IPython/utils/py3compat.py
@@ -193,14 +193,6 @@ 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):