Fix Requests 2, Version Bump to 0.3.5

This fixes a compatiblity issue with the new version of requests.
Bumps the release version to 0.3.5, and closes #39.

.travis.yml

@@ -1,7 +1,8 @@
 language: python
 before_install: openssl version
 env:
-  - WITH_REQUESTS="True"
+  - WITH_REQUESTS="2.x"
+  - WITH_REQUESTS="1.x"
   - WITH_REQUESTS="False"
 python:
   - 2.6
@@ -9,5 +10,6 @@ python:
   - pypy
 install: 
   - pip install PyYAML pytest --use-mirrors
-  - if [ $WITH_REQUESTS = "True" ] ; then pip install requests; fi
+  - if [ $WITH_REQUESTS = "1.x" ] ; then pip install requests==1.2.3; fi
+  - if [ $WITH_REQUESTS = "2.x" ] ; then pip install requests; fi
 script:  python setup.py test

README.md

@@ -259,6 +259,12 @@ This library is a work in progress, so the API might change on you.
 There are probably some [bugs](https://github.com/kevin1024/vcrpy/issues?labels=bug&page=1&state=open) floating around too.
 
 ##Changelog
+* 0.3.5: Fix compatibility with requests 2.x
+* 0.3.4: Bugfix: close file before renaming it.  This fixes an issue on Windows.  Thanks @smallcode for the fix.
+* 0.3.3: Bugfix for error message when an unreigstered custom matcher
+  was used
+* 0.3.2: Fix issue with new config syntax and the `match_on` parameter.
+  Thanks, @chromy!
 * 0.3.1: Fix issue causing full paths to be sent on the HTTP request
   line.
 * 0.3.0: *Backwards incompatible release* - Added support for record

setup.py

@@ -19,7 +19,7 @@ class PyTest(TestCommand):
         sys.exit(errno)
 
 setup(name='vcrpy',
-      version='0.3.1',
+      version='0.3.5',
       description="A Python port of Ruby's VCR to make mocking HTTP easier",
       author='Kevin McCarthy',
       author_email='me@kevinmccarthy.org',

tests/integration/test_config.py

@@ -1,6 +1,7 @@
 import os
 import json
 import urllib2
+import pytest
 import vcr
 
 
@@ -34,3 +35,22 @@ def test_override_set_cassette_library_dir(tmpdir):
 
     assert os.path.exists(str(tmpdir.join('subdir2').join('test.json')))
     assert not os.path.exists(str(tmpdir.join('subdir').join('test.json')))
+
+
+def test_override_match_on(tmpdir):
+    my_vcr = vcr.VCR(match_on=['method'])
+
+    with my_vcr.use_cassette(str(tmpdir.join('test.json'))) as cass:
+        urllib2.urlopen('http://httpbin.org/')
+        urllib2.urlopen('http://httpbin.org/get')
+
+    assert len(cass) == 1
+    assert cass.play_count == 1
+
+
+def test_missing_matcher():
+    my_vcr = vcr.VCR()
+    my_vcr.register_matcher("awesome", object)
+    with pytest.raises(KeyError):
+        with my_vcr.use_cassette("test.yaml", match_on=['notawesome']):
+            pass

tests/integration/test_wild.py

@@ -46,6 +46,7 @@ def test_flickr_multipart_upload():
         _pretend_to_be_flickr_library()
         assert cass.play_count == 1
 
+
 def test_flickr_should_respond_with_200(tmpdir):
     testfile = str(tmpdir.join('flickr.yml'))
     with vcr.use_cassette(testfile):

tests/unit/test_cassettes.py

@@ -50,6 +50,7 @@ def test_cassette_len():
 def _mock_requests_match(request1, request2, matchers):
     return request1 == request2
 
+
 @mock.patch('vcr.cassette.requests_match', _mock_requests_match)
 def test_cassette_contains():
     a = Cassette('test')

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, pypy, py26requests, py27requests, pypyrequests
+envlist = py26, py27, pypy, py26requests, py27requests, pypyrequests, py26oldrequests, py27oldrequests, pypyoldrequests
 
 [testenv]
 commands =
@@ -13,6 +13,27 @@ deps =
     pytest
     PyYAML
 
+[testenv:py26oldrequests]
+basepython = python2.6
+deps =
+    pytest
+    PyYAML
+    requests==1.2.3
+
+[testenv:py27oldrequests]
+basepython = python2.7
+deps =
+    pytest
+    PyYAML
+    requests==1.2.3
+
+[testenv:pypyoldrequests]
+basepython = pypy
+deps =
+    pytest
+    PyYAML
+    requests==1.2.3
+
 [testenv:py26requests]
 basepython = python2.6
 deps =

vcr/config.py

@@ -8,9 +8,11 @@ class VCR(object):
     def __init__(self,
                  serializer='yaml',
                  cassette_library_dir=None,
-                 record_mode="once"):
+                 record_mode="once",
+                 match_on=['url', 'method'],
+                 ):
         self.serializer = serializer
-        self.match_on = ['url', 'method']
+        self.match_on = match_on
         self.cassette_library_dir = cassette_library_dir
         self.serializers = {
             'yaml': yamlserializer,
@@ -40,10 +42,9 @@ class VCR(object):
         try:
             matchers = [self.matchers[m] for m in matcher_names]
         except KeyError:
-            print "Matcher {0} doesn't exist or isn't registered".format(
+            raise KeyError(
-                matcher_name
+                "Matcher {0} doesn't exist or isn't registered".format(m)
             )
-            raise KeyError
         return matchers
 
     def use_cassette(self, path, **kwargs):

vcr/patch.py

@@ -36,7 +36,7 @@ def install(cassette):
     httplib.HTTPConnection.cassette = cassette
     httplib.HTTPSConnection.cassette = cassette
 
-    # patch requests
+    # patch requests v1.x
     try:
         import requests.packages.urllib3.connectionpool as cpool
         from .stubs.requests_stubs import VCRVerifiedHTTPSConnection
@@ -44,6 +44,11 @@ def install(cassette):
         cpool.VerifiedHTTPSConnection.cassette = cassette
         cpool.HTTPConnection = VCRHTTPConnection
         cpool.HTTPConnection.cassette = cassette
+    # patch requests v2.x
+        cpool.HTTPConnectionPool.ConnectionCls = VCRHTTPConnection
+        cpool.HTTPConnectionPool.cassette = cassette
+        cpool.HTTPSConnectionPool.ConnectionCls = VCRHTTPSConnection
+        cpool.HTTPSConnectionPool.cassette = cassette
     except ImportError:  # pragma: no cover
         pass
 
@@ -68,6 +73,8 @@ def reset():
         import requests.packages.urllib3.connectionpool as cpool
         cpool.VerifiedHTTPSConnection = _VerifiedHTTPSConnection
         cpool.HTTPConnection = _HTTPConnection
+        cpool.HTTPConnectionPool.ConnectionCls = _HTTPConnection
+        cpool.HTTPSConnectionPool.ConnectionCls = _HTTPSConnection
     except ImportError:  # pragma: no cover
         pass
 
@@ -75,5 +82,7 @@ def reset():
         import urllib3.connectionpool as cpool
         cpool.VerifiedHTTPSConnection = _VerifiedHTTPSConnection
         cpool.HTTPConnection = _HTTPConnection
+        cpool.HTTPConnectionPool.ConnectionCls = _HTTPConnection
+        cpool.HTTPSConnectionPool.ConnectionCls = _HTTPSConnection
     except ImportError:  # pragma: no cover
         pass

vcr/stubs/__init__.py

@@ -77,6 +77,22 @@ class VCRConnectionMixin:
         '''
         self._vcr_request.body = (self._vcr_request.body or '') + data
 
+    def close(self):
+        self._restore_socket()
+	self._baseclass.close(self)
+
+    def _restore_socket(self):
+        """
+	Since some libraries (REQUESTS!!) decide to set options on
+	connection.socket, I need to delete the socket attribute
+	(which makes requests think this is a AppEngine connection)
+	and then restore it when I want to make the actual request.
+	This function restores it to its standard initial value
+	(which is None)
+        """
+	if not hasattr(self, 'sock'):
+            self.sock = None
+
     def _send_request(self, method, url, body, headers):
         """
         Copy+pasted from python stdlib 2.6 source because it
@@ -132,6 +148,7 @@ class VCRConnectionMixin:
         if isinstance(message_body, str):
             msg += message_body
             message_body = None
+	self._restore_socket()
         self._baseclass.send(self, msg)
         if message_body is not None:
             #message_body was not a string (i.e. it is a file) and
@@ -156,7 +173,10 @@ class VCRConnectionMixin:
             # Otherwise, we should send the request, then get the response
             # and return it.
 
-            # make the request
+	    # restore sock's value to None, since we need a real socket
+	    self._restore_socket()
+
+	    #make the actual request
             self._baseclass.request(
                 self,
                 method=self._vcr_request.method,
@@ -189,6 +209,8 @@ class VCRHTTPConnection(VCRConnectionMixin, HTTPConnection):
 
     def __init__(self, *args, **kwargs):
         HTTPConnection.__init__(self, *args, **kwargs)
+	# see VCRConnectionMixin._restore_socket for the motivation here
+	del self.sock
 
 
 class VCRHTTPSConnection(VCRConnectionMixin, HTTPSConnection):
@@ -203,3 +225,5 @@ class VCRHTTPSConnection(VCRConnectionMixin, HTTPSConnection):
         HTTPConnection.__init__(self, *args, **kwargs)
         self.key_file = kwargs.pop('key_file', None)
         self.cert_file = kwargs.pop('cert_file', None)
+	# see VCRConnectionMixin._restore_socket for the motivation here
+	del self.sock