diff --git a/tests/unit/test_http_errors.py b/tests/unit/test_http_errors.py index 4a1845b..4861d4e 100644 --- a/tests/unit/test_http_errors.py +++ b/tests/unit/test_http_errors.py @@ -2,10 +2,6 @@ from __future__ import unicode_literals import json import httpretty -# TEMP: Temporary hack until httpretty string checking is fixed -if httpretty.compat.PY3: - httpretty.core.basestring = (bytes, str) - try: import unittest2 as unittest # Python2.6 except ImportError: diff --git a/tox.ini b/tox.ini index 5e0c3da..b810cab 100644 --- a/tox.ini +++ b/tox.ini @@ -2,17 +2,19 @@ envlist = py26, py27, py33 [testenv] -commands = python -m unittest discover --catch tests/unit +commands = python -m unittest discover tests/unit deps = mock >= 1.0.0 - httpretty >= 0.6.1 + # Hold httpretty at 0.6.5 until https://github.com/gabrielfalcao/HTTPretty/issues/114 is resolved + httpretty == 0.6.5 ddt >= 0.3.0 [testenv:py26] -commands = unit2 discover --catch tests/unit +commands = unit2 discover tests/unit deps = mock >= 1.0.0 - httpretty >= 0.6.1 + # Hold httpretty at 0.6.5 until https://github.com/gabrielfalcao/HTTPretty/issues/114 is resolved + httpretty == 0.6.5 ddt >= 0.3.0 unittest2 discover