Permalink
Browse files

merge conflict

  • Loading branch information...
2 parents 4832db0 + 6b7f23f commit 3347146a441d47defaa4a1fe40337b68496c6bb7 @kennethreitz committed Jul 8, 2012
Showing with 7 additions and 3 deletions.
  1. +2 −2 README.rst
  2. +5 −1 requests/models.py
View
4 README.rst
@@ -2,8 +2,8 @@ Requests: HTTP for Humans
=========================
-.. image:: https://secure.travis-ci.org/kennethreitz/requests.png?branch=master
- :target: https://secure.travis-ci.org/kennethreitz/requests
+.. 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.
View
6 requests/models.py
@@ -7,10 +7,14 @@
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

0 comments on commit 3347146

Please sign in to comment.