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:
parent
1452cecd15
commit
b3b9049942
|
@ -113,6 +113,8 @@ try:
|
|||
hasattr(simplejson, '_speedups')):
|
||||
from simplejson import *
|
||||
use_system_version = True
|
||||
# Make sure we copy over the version. See #17071
|
||||
__version__ = simplejson.__version__
|
||||
except ImportError:
|
||||
pass
|
||||
|
||||
|
@ -126,6 +128,8 @@ if not use_system_version:
|
|||
JSONDecoder
|
||||
|
||||
use_system_version = True
|
||||
# Make sure we copy over the version. See #17071
|
||||
__version__ = json.__version__
|
||||
except (ImportError, NameError):
|
||||
pass
|
||||
|
||||
|
|
Loading…
Reference in New Issue