Refactor tox.ini using new 1.8 features.

tox.ini

@@ -1,188 +1,24 @@
-# Tox (http://tox.testrun.org/) is a tool for running tests
-# in multiple virtualenvs. This configuration file will run the
-# test suite on all supported python versions. To use it, "pip install tox"
-# and then run "tox" from this directory.
-
 [tox]
-envlist = 
+envlist = {py26,py27,py33,py34,pypy}-{requests24,requests23,requests22,requests1,httplib2,urllib3}
-    py26,
-    py27,
-    py33,
-    py34,
-    pypy,
-    py26requests24,
-    py27requests24,
-    py34requests24,
-    pypyrequests24,
-    py26requests23,
-    py27requests23,
-    py34requests23,
-    pypyrequests23,
-    py26requests22,
-    py27requests22,
-    py34requests22,
-    pypyrequests22,
-    py26requests1,
-    py27requests1,
-    py33requests1,
-    pypyrequests1,
-    py26httplib2,
-    py27httplib2,
-    py33httplib2,
-    py34httplib2,
-    pypyhttplib2,
 
 [testenv]
 commands =
     py.test {posargs}
+basepython =
+    py26: python2.6
+    py27: python2.7
+    py33: python3.3
+    py34: python3.4
+    pypy: pypy
 deps =
     mock
     pytest
     pytest-localserver
     PyYAML
     ipdb
-
+    requests1: requests==1.2.3
-[testenv:py26requests1]
+    requests24: requests==2.4.0
-basepython = python2.6
+    requests23: requests==2.3.0
-deps =
+    requests22: requests==2.2.1
-    {[testenv]deps}
+    httplib2: httplib2
-    requests==1.2.3
+    urllib3: urllib3==1.7.1
-
-[testenv:py27requests1]
-basepython = python2.7
-deps =
-    {[testenv]deps}
-    requests==1.2.3
-
-[testenv:py33requests1]
-basepython = python3.3
-deps =
-    {[testenv]deps}
-    requests==1.2.3
-
-[testenv:pypyrequests1]
-basepython = pypy
-deps =
-    {[testenv]deps}
-    requests==1.2.3
-
-[testenv:py26requests24]
-basepython = python2.6
-deps =
-    {[testenv]deps}
-    requests==2.4.0
-
-[testenv:py27requests24]
-basepython = python2.7
-deps =
-    {[testenv]deps}
-    requests==2.4.0
-
-[testenv:py33requests24]
-basepython = python3.4
-deps =
-    {[testenv]deps}
-    requests==2.4.0
-
-[testenv:py34requests24]
-basepython = python3.4
-deps =
-    {[testenv]deps}
-    requests==2.4.0
-
-[testenv:pypyrequests24]
-basepython = pypy
-deps =
-    {[testenv]deps}
-    requests==2.4.0
-
-[testenv:py26requests23]
-basepython = python2.6
-deps =
-    {[testenv]deps}
-    requests==2.3.0
-
-[testenv:py27requests23]
-basepython = python2.7
-deps =
-    {[testenv]deps}
-    requests==2.3.0
-
-[testenv:py33requests23]
-basepython = python3.4
-deps =
-    {[testenv]deps}
-    requests==2.3.0
-
-[testenv:py34requests23]
-basepython = python3.4
-deps =
-    {[testenv]deps}
-    requests==2.3.0
-
-[testenv:pypyrequests23]
-basepython = pypy
-deps =
-    {[testenv]deps}
-    requests==2.3.0
-
-[testenv:py26requests22]
-basepython = python2.6
-deps =
-    {[testenv]deps}
-    requests==2.2.1
-
-[testenv:py27requests22]
-basepython = python2.7
-deps =
-    {[testenv]deps}
-    requests==2.2.1
-
-[testenv:py33requests22]
-basepython = python3.4
-deps =
-    {[testenv]deps}
-    requests==2.2.1
-
-[testenv:py34requests22]
-basepython = python3.4
-deps =
-    {[testenv]deps}
-    requests==2.2.1
-    
-
-[testenv:pypyrequests22]
-basepython = pypy
-deps =
-    {[testenv]deps}
-    requests==2.2.1
-
-[testenv:py26httplib2]
-basepython = python2.6
-deps =
-    {[testenv]deps}
-    httplib2
-
-[testenv:py27httplib2]
-basepython = python2.7
-deps =
-    {[testenv]deps}
-    httplib2
-
-[testenv:py33httplib2]
-basepython = python3.4
-deps =
-    {[testenv]deps}
-    httplib2
-
-[testenv:py34httplib2]
-basepython = python3.4
-deps =
-    {[testenv]deps}
-    httplib2
-
-[testenv:pypyhttplib2]
-basepython = pypy
-deps =
-    {[testenv]deps}
-    httplib2

vcr/patch.py

@@ -273,6 +273,7 @@ def reset_patchers():
         yield mock.patch.object(cpool, 'VerifiedHTTPSConnection', _VerifiedHTTPSConnection)
         yield mock.patch.object(cpool, 'HTTPConnection', _HTTPConnection)
         yield mock.patch.object(cpool, 'HTTPSConnection', _HTTPSConnection)
+        if hasattr(cpool.HTTPConnectionPool, 'ConnectionCls'):
             yield mock.patch.object(cpool.HTTPConnectionPool, 'ConnectionCls', _HTTPConnection)
             yield mock.patch.object(cpool.HTTPSConnectionPool, 'ConnectionCls', _HTTPSConnection)