From: Kenneth Reitz Date: Tue, 21 Jun 2011 21:59:24 +0000 (-0400) Subject: omnijson for tests X-Git-Tag: v0.5.0^2~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bdf9f90c8a3015ff7b7d03259ce57ec0ee98eb12;p=services%2Fpython-requests.git omnijson for tests --- diff --git a/test_requests.py b/test_requests.py index b1fe22c..8a6b0ae 100755 --- a/test_requests.py +++ b/test_requests.py @@ -5,10 +5,8 @@ from __future__ import with_statement import unittest import cookielib -try: - import simplejson as json -except ImportError: - import json + +import omnijson as json import requests diff --git a/tox.ini b/tox.ini index 87e79ac..3c2ef1f 100644 --- a/tox.ini +++ b/tox.ini @@ -5,3 +5,4 @@ envlist = py25,py26,py27 commands=py.test --junitxml=junit-{envname}.xml deps = pytest + omnijson