diff options
| author | Ramiro Morales <cramm0@gmail.com> | 2012-04-01 21:11:46 +0000 |
|---|---|---|
| committer | Ramiro Morales <cramm0@gmail.com> | 2012-04-01 21:11:46 +0000 |
| commit | cac5d9fd80b3bba0ca3059c8ad106799f54863ea (patch) | |
| tree | cd45b19a3e0d6d84bfae89167d7c4a8a52fe5847 /django/utils/simplejson/__init__.py | |
| parent | 7d5979f95386775205a5b825cd2a9ec7d8a311b8 (diff) | |
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
Diffstat (limited to 'django/utils/simplejson/__init__.py')
| -rw-r--r-- | django/utils/simplejson/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
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 |