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

Fixed #17071 -- Made sure we report the right version of system-level {simple,}json module. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ramiro Morales 2011-10-20 17:21:10 +00:00
parent 1452cecd15
commit b3b9049942
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,6 +113,8 @@ try:
hasattr(simplejson, '_speedups')): hasattr(simplejson, '_speedups')):
from simplejson import * from simplejson import *
use_system_version = True use_system_version = True
# Make sure we copy over the version. See #17071
__version__ = simplejson.__version__
except ImportError: except ImportError:
pass pass
@ -126,6 +128,8 @@ if not use_system_version:
JSONDecoder JSONDecoder
use_system_version = True use_system_version = True
# Make sure we copy over the version. See #17071
__version__ = json.__version__
except (ImportError, NameError): except (ImportError, NameError):
pass pass