From f8c98715c307dda487d0cc404eb7d26c53c49aa4 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 8 Jul 2012 00:24:24 -0400 Subject: [PATCH] simplify #710 --- requests/compat.py | 4 ++++ requests/models.py | 7 +------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/requests/compat.py b/requests/compat.py index b76bc153..8e4a17e4 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 40187244..694d62a1 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