Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit cac5d9fd80b3bba0ca3059c8ad106799f54863ea 1 parent 7d5979f
Ramiro Morales ramiro authored
Showing with 2 additions and 1 deletion.
  1. +2 −1  django/utils/simplejson/__init__.py
3  django/utils/simplejson/__init__.py
View
@@ -129,7 +129,8 @@
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
Please sign in to comment.
Something went wrong with that request. Please try again.