Procházet zdrojové kódy

Fix test_retry_kwargs_can_be_empty on pypy3

Fixes #3391
Berker Peksag před 8 roky
rodič
revize
ed79ccfb8b
1 změnil soubory, kde provedl 4 přidání a 2 odebrání
  1. 4 2
      celery/utils/serialization.py

+ 4 - 2
celery/utils/serialization.py

@@ -24,7 +24,7 @@ try:
 except ImportError:
 except ImportError:
     import pickle  # noqa
     import pickle  # noqa
 
 
-PY3 = sys.version_info[0] >= 3
+PY33 = sys.version_info >= (3, 3)
 
 
 __all__ = [
 __all__ = [
     'UnpickleableExceptionWrapper', 'subclass_exception',
     'UnpickleableExceptionWrapper', 'subclass_exception',
@@ -241,7 +241,9 @@ def jsonify(obj,
         return unknown_type_filter(obj)
         return unknown_type_filter(obj)
 
 
 
 
-if PY3:
+# Since PyPy 3 targets Python 3.2, 'raise exc from None' will
+# raise a TypeError so we need to look for Python 3.3 or newer
+if PY33:
     from vine.five import exec_
     from vine.five import exec_
     _raise_with_context = None  # for flake8
     _raise_with_context = None  # for flake8
     exec_("""def _raise_with_context(exc, ctx): raise exc from ctx""")
     exec_("""def _raise_with_context(exc, ctx): raise exc from ctx""")