Add cpython2_only decorator

danilobellini · danilobellini · commit 4518b9af3aa1 · 2016-07-29T18:58:57.000-03:00
The test_pretty.test_dictproxy now is properly skipped on PyPy
diff --git a/IPython/lib/tests/test_pretty.py b/IPython/lib/tests/test_pretty.py
@@ -12,7 +12,8 @@
 import nose.tools as nt
 
 from IPython.lib import pretty
-from IPython.testing.decorators import skip_without, py2_only, py3_only
+from IPython.testing.decorators import (skip_without, py2_only, py3_only,
+                                        cpython2_only)
 from IPython.utils.py3compat import PY3, unicode_to_str
 
 if PY3:
@@ -483,7 +484,7 @@ def test_mappingproxy():
     for obj, expected in cases:
         nt.assert_equal(pretty.pretty(obj), expected)
 
-@py2_only
+@cpython2_only # In PyPy, types.DictProxyType is dict
 def test_dictproxy():
     # This is the dictproxy constructor itself from the Python API,
     DP = ctypes.pythonapi.PyDictProxy_New
diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py
@@ -48,7 +48,7 @@
 from IPython.external.decorators import *
 
 # For onlyif_cmd_exists decorator
-from IPython.utils.py3compat import string_types, which, PY2, PY3
+from IPython.utils.py3compat import string_types, which, PY2, PY3, PYPY
 
 #-----------------------------------------------------------------------------
 # Classes and functions
@@ -336,6 +336,7 @@ def skip_file_no_x11(name):
 known_failure_py3 = knownfailureif(sys.version_info[0] >= 3, 
                                     'This test is known to fail on Python 3.')
 
+cpython2_only = skipif(PY3 or PYPY, "This test only runs on CPython 2.")
 py2_only = skipif(PY3, "This test only runs on Python 2.")
 py3_only = skipif(PY2, "This test only runs on Python 3.")
 
diff --git a/IPython/utils/py3compat.py b/IPython/utils/py3compat.py
@@ -292,6 +292,7 @@ def execfile(fname, glob=None, loc=None, compiler=None):
 
 
 PY2 = not PY3
+PYPY = any(k.startswith("pypy") for k in dir(sys))
 
 
 def annotate(**kwargs):

Original file line number	Diff line number	Diff line change
`@@ -292,6 +292,7 @@ def execfile(fname, glob=None, loc=None, compiler=None):`
`292`	`292`
`293`	`293`
`294`	`294`	`PY2 = not PY3`
	`295`	`+PYPY = any(k.startswith("pypy") for k in dir(sys))`
`295`	`296`
`296`	`297`
`297`	`298`	`def annotate(**kwargs):`