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:
parent
7d5979f953
commit
cac5d9fd80
|
@ -129,7 +129,8 @@ if not use_system_version:
|
|||
|
||||
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
|
||||
|
||||
|
|
Loading…
Reference in New Issue