From b3b904994209bf568620def764e6a8e51de9ecb0 Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Thu, 20 Oct 2011 17:21:10 +0000 Subject: [PATCH] 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 --- django/utils/simplejson/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/django/utils/simplejson/__init__.py b/django/utils/simplejson/__init__.py index 9a8c5a348a..a9418da6c6 100644 --- a/django/utils/simplejson/__init__.py +++ b/django/utils/simplejson/__init__.py @@ -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