From cac5d9fd80b3bba0ca3059c8ad106799f54863ea Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Sun, 1 Apr 2012 21:11:46 +0000 Subject: [PATCH] Fixed #18022 -- Fixed import of standalone Python 'json' module. Thanks Clueless for the report and initial patch. Refs #17071, r17018. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17865 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/utils/simplejson/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/django/utils/simplejson/__init__.py b/django/utils/simplejson/__init__.py index a9418da6c6..2fb3733d11 100644 --- a/django/utils/simplejson/__init__.py +++ b/django/utils/simplejson/__init__.py @@ -129,7 +129,8 @@ if not use_system_version: use_system_version = True # Make sure we copy over the version. See #17071 - __version__ = json.__version__ + from json import __version__ as json_version + __version__ = json_version except (ImportError, NameError): pass