Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
  • Loading branch information...
commit b3b904994209bf568620def764e6a8e51de9ecb0 1 parent 1452cec
@ramiro ramiro authored
Showing with 4 additions and 0 deletions.
  1. +4 −0 django/utils/simplejson/__init__.py
View
4 django/utils/simplejson/__init__.py
@@ -113,6 +113,8 @@
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 @@
JSONDecoder
use_system_version = True
+ # Make sure we copy over the version. See #17071
+ __version__ = json.__version__
except (ImportError, NameError):
pass

0 comments on commit b3b9049

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