Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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 authored April 01, 2012

Showing 1 changed file with 2 additions and 1 deletion. Show diff stats Hide diff stats

  1. 3  django/utils/simplejson/__init__.py
3  django/utils/simplejson/__init__.py
@@ -129,7 +129,8 @@
129 129
 
130 130
         use_system_version = True
131 131
         # Make sure we copy over the version. See #17071
132  
-        __version__ = json.__version__
  132
+        from json import __version__ as json_version
  133
+        __version__ = json_version
133 134
     except (ImportError, NameError):
134 135
         pass
135 136
 

0 notes on commit cac5d9f

Please sign in to comment.
Something went wrong with that request. Please try again.