Merge pull request #3056 from digitaldavenyc/native_json

Import native Python JSON only
psf · Mar 16, 2016 · 0acbf2b · 0acbf2b
2 parents e668a09 + 09ecb71
commit 0acbf2b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/requests/compat.py b/requests/compat.py
@@ -21,12 +21,6 @@
 #: Python 3.x?
 is_py3 = (_ver[0] == 3)
 
-try:
-    import simplejson as json
-except (ImportError, SyntaxError):
-    # simplejson does not support Python 3.2, it throws a SyntaxError
-    # because of u'...' Unicode literals.
-    import json
 
 # ---------
 # Specifics

diff --git a/requests/models.py b/requests/models.py
@@ -32,7 +32,7 @@
 from .compat import (
     cookielib, urlunparse, urlsplit, urlencode, str, bytes, StringIO,
     is_py2, chardet, builtin_str, basestring)
-from .compat import json as complexjson
+import json as complexjson
 from .status_codes import codes
 
 #: The set of HTTP status codes that indicate an automatically