From: Kenneth Reitz <me@kennethreitz.com>
Date: Sun, 8 Jul 2012 04:24:24 +0000 (-0400)
Subject: simplify #710
X-Git-Tag: v0.13.3~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8c98715c307dda487d0cc404eb7d26c53c49aa4;p=services%2Fpython-requests.git

simplify #710
---

diff --git a/requests/compat.py b/requests/compat.py
index b76bc15..8e4a17e 100644
--- a/requests/compat.py
+++ b/requests/compat.py
@@ -72,6 +72,10 @@ is_osx = ('darwin' in str(sys.platform).lower())
 is_hpux = ('hpux' in str(sys.platform).lower())   # Complete guess.
 is_solaris = ('solar==' in str(sys.platform).lower())   # Complete guess.
 
+try:
+    import simplejson as json
+except ImportError:
+    import json
 
 # ---------
 # Specifics
diff --git a/requests/models.py b/requests/models.py
index 4018724..694d62a 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -10,11 +10,6 @@ This module contains the primary objects that power Requests.
 import os
 from datetime import datetime
 
-try:
-    import simplejson as json
-except ImportError:
-    import json
-
 from .hooks import dispatch_hook, HOOKS
 from .structures import CaseInsensitiveDict
 from .status_codes import codes
@@ -36,7 +31,7 @@ from .utils import (
     DEFAULT_CA_BUNDLE_PATH)
 from .compat import (
     cookielib, urlparse, urlunparse, urljoin, urlsplit, urlencode, str, bytes,
-    StringIO, is_py2, chardet)
+    StringIO, is_py2, chardet, json)
 
 REDIRECT_STATI = (codes.moved, codes.found, codes.other, codes.temporary_moved)
 CONTENT_CHUNK_SIZE = 10 * 1024