From bd2d2cea72f828fa61656be154a161ee33668616 Mon Sep 17 00:00:00 2001 From: Kevin McCarthy Date: Wed, 23 Apr 2014 18:58:17 -1000 Subject: [PATCH] bump supported python3 version to 3.4 --- .travis.yml | 4 ++-- tox.ini | 20 ++++++++++---------- vcr/stubs/__init__.py | 1 + 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 723bfee..58a4bf9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,11 +14,11 @@ matrix: - env: WITH_LIB="boto" exclude: - env: WITH_LIB="boto" - python: 3.3 + python: 3.4 python: - 2.6 - 2.7 -- 3.3 +- 3.4 - pypy install: - pip install PyYAML pytest --use-mirrors diff --git a/tox.ini b/tox.ini index 9e064b3..40965a2 100644 --- a/tox.ini +++ b/tox.ini @@ -7,19 +7,19 @@ envlist = py26 py27 - py33 + py34 pypy py26requests py27requests - py33requests + py34requests pypyrequests py26oldrequests py27oldrequests - py33oldrequests + py34oldrequests pypyoldrequests py26httplib2 py27httplib2 - py33httplib2 + py34httplib2 pypyhttplib2 [testenv] @@ -46,8 +46,8 @@ deps = PyYAML requests==1.2.3 -[testenv:py33oldrequests] -basepython = python3.3 +[testenv:py34oldrequests] +basepython = python3.4 deps = mock pytest @@ -78,8 +78,8 @@ deps = PyYAML requests -[testenv:py33requests] -basepython = python3.3 +[testenv:py34requests] +basepython = python3.4 deps = mock pytest @@ -110,8 +110,8 @@ deps = PyYAML httplib2 -[testenv:py33httplib2] -basepython = python3.3 +[testenv:py34httplib2] +basepython = python3.4 deps = mock pytest diff --git a/vcr/stubs/__init__.py b/vcr/stubs/__init__.py index 702472a..3d32570 100644 --- a/vcr/stubs/__init__.py +++ b/vcr/stubs/__init__.py @@ -228,6 +228,7 @@ class VCRConnection: reset() self.real_connection = self._baseclass(*args, **kwargs) install(self.cassette) + self.sock = self.real_connection.sock class VCRHTTPConnection(VCRConnection):