Mirroring/vcrpy
1
0
Fork 0
mirror of https://github.com/kevin1024/vcrpy.git synced 2025-12-09 09:13:23 +00:00
Code Releases Activity

Merge pull request #125 from gazpachoking/pool_is_none

Browse Source 
Fix crash with requests 2.5 where connectionpool was None
This commit is contained in:
Ivan 'Goat' Malison
2014-12-08 13:20:36 -08:00
parent 562a0ebadc ef8ba6d51b
commit da45f46b2d
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -8,6 +8,7 @@ env:
- WITH_LIB="requests2.2" - WITH_LIB="requests2.2"
- WITH_LIB="requests2.3" - WITH_LIB="requests2.3"
- WITH_LIB="requests2.4" - WITH_LIB="requests2.4"
- WITH_LIB="requests2.5"
- WITH_LIB="requests1.x" - WITH_LIB="requests1.x"
- WITH_LIB="httplib2" - WITH_LIB="httplib2"
- WITH_LIB="boto" - WITH_LIB="boto"
@@ -33,6 +34,7 @@ install:
- if [ $WITH_LIB = "requests2.2" ] ; then pip install requests==2.2.1; fi - if [ $WITH_LIB = "requests2.2" ] ; then pip install requests==2.2.1; fi
- if [ $WITH_LIB = "requests2.3" ] ; then pip install requests==2.3.0; fi - if [ $WITH_LIB = "requests2.3" ] ; then pip install requests==2.3.0; fi
- if [ $WITH_LIB = "requests2.4" ] ; then pip install requests==2.4.0; fi - if [ $WITH_LIB = "requests2.4" ] ; then pip install requests==2.4.0; fi
- if [ $WITH_LIB = "requests2.5" ] ; then pip install requests==2.5.0; fi
- if [ $WITH_LIB = "httplib2" ] ; then pip install httplib2; fi - if [ $WITH_LIB = "httplib2" ] ; then pip install httplib2; fi
- if [ $WITH_LIB = "boto" ] ; then pip install boto; fi - if [ $WITH_LIB = "boto" ] ; then pip install boto; fi
script: python setup.py test script: python setup.py test

5
tox.ini
View File

@@ -1,5 +1,5 @@
[tox] [tox]
envlist = {py26,py27,py33,py34,pypy}-{requests24,requests23,requests22,requests1,httplib2,urllib3,boto} envlist = {py26,py27,py33,py34,pypy}-{requests25,requests24,requests23,requests22,requests1,httplib2,urllib3,boto}
[testenv] [testenv]
commands = commands =
@@ -16,9 +16,10 @@ deps =
pytest-localserver pytest-localserver
PyYAML PyYAML
requests1: requests==1.2.3 requests1: requests==1.2.3
requests25: requests==2.5.0
requests24: requests==2.4.0 requests24: requests==2.4.0
requests23: requests==2.3.0 requests23: requests==2.3.0
requests22: requests==2.2.1 requests22: requests==2.2.1
httplib2: httplib2 httplib2: httplib2
urllib3: urllib3==1.7.1 urllib3: urllib3==1.7.1
boto: boto boto: boto

2
vcr/patch.py
View File

@@ -237,7 +237,7 @@ class ConnectionRemover(object):
def __exit__(self, *args): def __exit__(self, *args):
for pool, connections in self._connection_pool_to_connections.items(): for pool, connections in self._connection_pool_to_connections.items():
readd_connections = [] readd_connections = []
while not pool.pool.empty() and connections: while pool.pool and not pool.pool.empty() and connections:
connection = pool.pool.get() connection = pool.pool.get()
if isinstance(connection, self._connection_class): if isinstance(connection, self._connection_class):
connections.remove(connection) connections.remove(connection)