test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Ramiro Morales 2012-04-01 21:11:46 +00:00
parent 7d5979f953
commit cac5d9fd80
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/utils/simplejson/__init__.py
View File

@ -129,7 +129,8 @@ if not use_system_version:
use_system_version = True use_system_version = True
# Make sure we copy over the version. See #17071 # 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): except (ImportError, NameError):
pass pass