From 0512132b916ca5e17f56adf4b0aaba31f374eb36 Mon Sep 17 00:00:00 2001 From: Weston Platter Date: Sat, 30 Jun 2012 18:33:40 -0400 Subject: [PATCH 1/2] made the TravisCI PNG link to TravisCI project status page --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index 38ceba11..b2572feb 100644 --- a/README.rst +++ b/README.rst @@ -3,6 +3,7 @@ Requests: HTTP for Humans .. image:: https://secure.travis-ci.org/kennethreitz/requests.png?branch=develop + :target: https://secure.travis-ci.org/kennethreitz/requests Requests is an ISC Licensed HTTP library, written in Python, for human beings. From 25299400fafc5f1dead16f04eb258dc60b59c148 Mon Sep 17 00:00:00 2001 From: Zach Williams Date: Sat, 7 Jul 2012 21:14:29 -0700 Subject: [PATCH 2/2] Add try/catch for simplejson vs json --- requests/models.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/requests/models.py b/requests/models.py index 7eb3efe7..40187244 100644 --- a/requests/models.py +++ b/requests/models.py @@ -7,10 +7,14 @@ requests.models This module contains the primary objects that power Requests. """ -import json 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