Skip to content

Commit

Permalink
Merge pull request #710 from zachwill/develop
Browse files Browse the repository at this point in the history
Add try/catch for simplejson vs json
  • Loading branch information
Kenneth Reitz committed Jul 8, 2012
2 parents 808b0ad + 2529940 commit 6b7f23f
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion requests/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6b7f23f

Please sign in to comment.