remove Python2/3 specific decorators

ivanov · ivanov · commit cf0d493023cf · 2016-10-21T17:48:15.000-07:00
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
@@ -57,7 +57,7 @@
 from IPython.core.prefilter import PrefilterManager
 from IPython.core.profiledir import ProfileDir
 from IPython.core.usage import default_banner
-from IPython.testing.skipdoctest import skip_doctest_py2, skip_doctest
+from IPython.testing.skipdoctest import skip_doctest
 from IPython.utils import PyColorize
 from IPython.utils import io
 from IPython.utils import py3compat
@@ -1919,7 +1919,6 @@ def init_completer(self):
         self.set_hook('complete_command', reset_completer, str_key = '%reset')
 
 
-    @skip_doctest_py2
     def complete(self, text, line=None, cursor_pos=None):
         """Return the completed text and a list of completions.
 
diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
@@ -31,7 +31,6 @@
 # IPython's own
 from IPython.core import page
 from IPython.lib.pretty import pretty
-from IPython.testing.skipdoctest import skip_doctest_py3
 from IPython.utils import PyColorize
 from IPython.utils import openpy
 from IPython.utils import py3compat
@@ -436,66 +435,6 @@ def pdef(self, obj, oname=''):
         else:
             print(header,self.format(output), end=' ')
 
-    # In Python 3, all classes are new-style, so they all have __init__.
-    @skip_doctest_py3
-    def pdoc(self, obj, oname='', formatter=None):
-        """Print the docstring for any object.
-
-        Optional:
-        -formatter: a function to run the docstring through for specially
-        formatted docstrings.
-
-        Examples
-        --------
-
-        In [1]: class NoInit:
-           ...:     pass
-
-        In [2]: class NoDoc:
-           ...:     def __init__(self):
-           ...:         pass
-
-        In [3]: %pdoc NoDoc
-        No documentation found for NoDoc
-
-        In [4]: %pdoc NoInit
-        No documentation found for NoInit
-
-        In [5]: obj = NoInit()
-
-        In [6]: %pdoc obj
-        No documentation found for obj
-
-        In [5]: obj2 = NoDoc()
-
-        In [6]: %pdoc obj2
-        No documentation found for obj2
-        """
-
-        head = self.__head  # For convenience
-        lines = []
-        ds = getdoc(obj)
-        if formatter:
-            ds = formatter(ds).get('plain/text', ds)
-        if ds:
-            lines.append(head("Class docstring:"))
-            lines.append(indent(ds))
-        if inspect.isclass(obj) and hasattr(obj, '__init__'):
-            init_ds = getdoc(obj.__init__)
-            if init_ds is not None:
-                lines.append(head("Init docstring:"))
-                lines.append(indent(init_ds))
-        elif hasattr(obj,'__call__'):
-            call_ds = getdoc(obj.__call__)
-            if call_ds:
-                lines.append(head("Call docstring:"))
-                lines.append(indent(call_ds))
-
-        if not lines:
-            self.noinfo('documentation',oname)
-        else:
-            page.page('\n'.join(lines))
-
     def psource(self, obj, oname=''):
         """Print the source code for an object."""
 
diff --git a/IPython/lib/tests/test_pretty.py b/IPython/lib/tests/test_pretty.py
@@ -12,14 +12,9 @@
 import nose.tools as nt
 
 from IPython.lib import pretty
-from IPython.testing.decorators import (skip_without, py2_only, py3_only)
-                                        
-from IPython.utils.py3compat import PY3, unicode_to_str
+from IPython.testing.decorators import skip_without
 
-if PY3:
-    from io import StringIO
-else:
-    from StringIO import StringIO
+from io import StringIO
 
 
 class MyList(object):
@@ -245,7 +240,7 @@ def test_metaclass_repr():
 
 def test_unicode_repr():
     u = u"üniçodé"
-    ustr = unicode_to_str(u)
+    ustr = u
     
     class C(object):
         def __repr__(self):
@@ -276,83 +271,6 @@ def type_pprint_wrapper(obj, p, cycle):
     nt.assert_true(type_pprint_wrapper.called)
 
 
-# This is only run on Python 2 because in Python 3 the language prevents you
-# from setting a non-unicode value for __qualname__ on a metaclass, and it
-# doesn't respect the descriptor protocol if you subclass unicode and implement
-# __get__.
-@py2_only
-def test_fallback_to__name__on_type():
-    # Test that we correctly repr types that have non-string values for
-    # __qualname__ by falling back to __name__
-
-    class Type(object):
-        __qualname__ = 5
-
-    # Test repring of the type.
-    stream = StringIO()
-    printer = pretty.RepresentationPrinter(stream)
-
-    printer.pretty(Type)
-    printer.flush()
-    output = stream.getvalue()
-
-    # If __qualname__ is malformed, we should fall back to __name__.
-    expected = '.'.join([__name__, Type.__name__])
-    nt.assert_equal(output, expected)
-
-    # Clear stream buffer.
-    stream.buf = ''
-
-    # Test repring of an instance of the type.
-    instance = Type()
-    printer.pretty(instance)
-    printer.flush()
-    output = stream.getvalue()
-
-    # Should look like:
-    # <IPython.lib.tests.test_pretty.Type at 0x7f7658ae07d0>
-    prefix = '<' + '.'.join([__name__, Type.__name__]) + ' at 0x'
-    nt.assert_true(output.startswith(prefix))
-
-
-@py2_only
-def test_fail_gracefully_on_bogus__qualname__and__name__():
-    # Test that we correctly repr types that have non-string values for both
-    # __qualname__ and __name__
-
-    class Meta(type):
-        __name__ = 5
-
-    class Type(object):
-        __metaclass__ = Meta
-        __qualname__ = 5
-
-    stream = StringIO()
-    printer = pretty.RepresentationPrinter(stream)
-
-    printer.pretty(Type)
-    printer.flush()
-    output = stream.getvalue()
-
-    # If we can't find __name__ or __qualname__ just use a sentinel string.
-    expected = '.'.join([__name__, '<unknown type>'])
-    nt.assert_equal(output, expected)
-
-    # Clear stream buffer.
-    stream.buf = ''
-
-    # Test repring of an instance of the type.
-    instance = Type()
-    printer.pretty(instance)
-    printer.flush()
-    output = stream.getvalue()
-
-    # Should look like:
-    # <IPython.lib.tests.test_pretty.<unknown type> at 0x7f7658ae07d0>
-    prefix = '<' + '.'.join([__name__, '<unknown type>']) + ' at 0x'
-    nt.assert_true(output.startswith(prefix))
-
-
 def test_collections_defaultdict():
     # Create defaultdicts with cycles
     a = defaultdict()
@@ -441,7 +359,6 @@ class MyCounter(Counter):
     for obj, expected in cases:
         nt.assert_equal(pretty.pretty(obj), expected)
 
-@py3_only
 def test_mappingproxy():
     MP = types.MappingProxyType
     underlying_dict = {}
diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py
@@ -334,12 +334,6 @@ def skip_file_no_x11(name):
 
 skip_known_failure = knownfailureif(True,'This test is known to fail')
 
-known_failure_py3 = knownfailureif(sys.version_info[0] >= 3, 
-                                    'This test is known to fail on Python 3.')
-
-py2_only = skipif(PY3, "This test only runs on Python 2.")
-py3_only = skipif(PY2, "This test only runs on Python 3.")
-
 # A null 'decorator', useful to make more readable code that needs to pick
 # between different decorators based on OS or other conditions
 null_deco = lambda f: f
diff --git a/IPython/testing/skipdoctest.py b/IPython/testing/skipdoctest.py
@@ -17,14 +17,3 @@ def skip_doctest(f):
     etc."""
     f.skip_doctest = True
     return f
-
-
-def skip_doctest_py3(f):
-    """Decorator - skip the doctest under Python 3."""
-    f.skip_doctest = (sys.version_info[0] >= 3)
-    return f
-
-def skip_doctest_py2(f):
-    """Decorator - skip the doctest under Python 3."""
-    f.skip_doctest = (sys.version_info[0] < 3)
-    return f
diff --git a/IPython/utils/text.py b/IPython/utils/text.py
@@ -20,7 +20,7 @@
     # Python 2 backport
     from pathlib2 import Path
 
-from IPython.testing.skipdoctest import skip_doctest_py3, skip_doctest
+from IPython.testing.skipdoctest import skip_doctest
 from IPython.utils import py3compat
 
 # datetime.strftime date format for ipython
@@ -517,7 +517,7 @@ def get_field(self, name, args, kwargs):
 # inside [], so EvalFormatter can handle slicing. Once we only support 3.4 and
 # above, it should be possible to remove FullEvalFormatter.
 
-@skip_doctest_py3
+@skip_doctest
 class FullEvalFormatter(Formatter):
     """A String Formatter that allows evaluation of simple expressions.
     
@@ -574,7 +574,7 @@ def vformat(self, format_string, args, kwargs):
         return u''.join(py3compat.cast_unicode(s) for s in result)
 
 
-@skip_doctest_py3
+@skip_doctest
 class DollarFormatter(FullEvalFormatter):
     """Formatter allowing Itpl style $foo replacement, for names and attribute
     access only. Standard {foo} replacement also works, and allows full
