[pypy-commit] pypy py3.5: merge heads

[plan_rich]

Author: Richard Plangger <planrichi at gmail.com>
Branch: py3.5
Changeset: r89630:ae346d1e5a98
Date: 2017-01-17 11:29 +0100
http://bitbucket.org/pypy/pypy/changeset/ae346d1e5a98/

Log:	merge heads

diff --git a/lib-python/3/test/test_json/__init__.py b/lib-python/3/test/test_json/__init__.py
--- a/lib-python/3/test/test_json/__init__.py
+++ b/lib-python/3/test/test_json/__init__.py
@@ -10,7 +10,8 @@
 cjson = support.import_fresh_module('json', fresh=['_json'])
 pyjson = support.import_fresh_module('json', blocked=['_json'])
 # JSONDecodeError is cached inside the _json module
-cjson.JSONDecodeError = cjson.decoder.JSONDecodeError = json.JSONDecodeError
+if cjson is not None:
+    cjson.JSONDecodeError = cjson.decoder.JSONDecodeError = json.JSONDecodeError
 
 # create two base classes that will be used by the other tests
 class PyTest(unittest.TestCase):