Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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 Morales authored October 20, 2011

Showing 1 changed file with 4 additions and 0 deletions. Show diff stats Hide diff stats

  1. 4  django/utils/simplejson/__init__.py
4  django/utils/simplejson/__init__.py
@@ -113,6 +113,8 @@
113 113
             hasattr(simplejson, '_speedups')):
114 114
         from simplejson import *
115 115
         use_system_version = True
  116
+        # Make sure we copy over the version. See #17071
  117
+        __version__ = simplejson.__version__
116 118
 except ImportError:
117 119
     pass
118 120
 
@@ -126,6 +128,8 @@
126 128
         JSONDecoder
127 129
 
128 130
         use_system_version = True
  131
+        # Make sure we copy over the version. See #17071
  132
+        __version__ = json.__version__
129 133
     except (ImportError, NameError):
130 134
         pass
131 135
 

0 notes on commit b3b9049

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