bump version

python3 uses capital headers sometimes, let's do a case-agnostic header removal
we dont actually need lxml for tests
2025-12-08 16:53:23 +00:00 · 2015-05-05 22:22:37 -10:00 · 2015-05-05 21:59:48 -10:00 · 2015-05-05 21:59:31 -10:00 · 2015-05-05 21:32:32 -10:00 · 2015-05-05 20:49:12 -10:00
7 changed files with 28 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ env:
    - WITH_LIB="requests2.3"
    - WITH_LIB="requests2.4"
    - WITH_LIB="requests2.5"
+    - WITH_LIB="requests2.7"
    - WITH_LIB="requests1.x"
    - WITH_LIB="httplib2"
    - WITH_LIB="boto"
@@ -38,6 +39,7 @@ install:
 - 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.5" ] ; then pip install requests==2.5.0; fi
+- if [ $WITH_LIB = "requests2.7" ] ; then pip install requests==2.7.0; fi
 - if [ $WITH_LIB = "httplib2" ] ; then pip install httplib2; fi
 - if [ $WITH_LIB = "boto" ] ; then pip install boto; fi
 - if [ $WITH_LIB = "urllib31.7" ] ; then pip install certifi urllib3==1.7.1; fi
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -0,0 +1,4 @@
+include README.md
+include LICENSE.txt
+include tox.ini
+recursive-include tests *
--- a/README.md
+++ b/README.md
@@ -484,6 +484,8 @@ API in version 1.0.x


 ## Changelog
+  * 1.4.2 Fix a bug caused by requests 2.7 and chunked transfer encoding
+  * 1.4.1 Include README, tests, LICENSE in package.  Thanks @ralphbean.
  * 1.4.0 Filter post data parameters (thanks @eadmundo), support for
    posting files through requests, inject_cassette kwarg to access
    cassette from `use_cassette` decorated function,
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ class PyTest(TestCommand):

 setup(
    name='vcrpy',
-    version='1.4.0',
+    version='1.4.2',
    description=(
        "Automatically mock your HTTP interactions to simplify and "
        "speed up testing"
--- a/tests/integration/test_wild.py
+++ b/tests/integration/test_wild.py
@@ -64,3 +64,11 @@ def test_cookies(tmpdir):
        r1 = s.get("http://httpbin.org/cookies/set?k1=v1&k2=v2")
        r2 = s.get("http://httpbin.org/cookies")
        assert len(r2.json()['cookies']) == 2
+
+
+def test_amazon_doctype(tmpdir):
+    # amazon gzips its homepage.  For some reason, in requests 2.7, it's not
+    # getting gunzipped.
+    with vcr.use_cassette(str(tmpdir.join('amz.yml'))):
+        r = requests.get('http://www.amazon.com')
+    assert 'html' in r.text
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py26,py27,py33,py34,pypy}-{requests25,requests24,requests23,requests22,requests1,httplib2,urllib317,urllib319,urllib3110,boto}
+envlist = {py26,py27,py33,py34,pypy}-{requests27,requests26,requests25,requests24,requests23,requests22,requests1,httplib2,urllib317,urllib319,urllib3110,boto}

 [testenv]
 commands =
@@ -16,6 +16,8 @@ deps =
    pytest-localserver
    PyYAML
    requests1: requests==1.2.3
+    requests27: requests==2.7.0
+    requests22: requests==2.6.0
    requests25: requests==2.5.0
    requests24: requests==2.4.0
    requests23: requests==2.3.0
--- a/vcr/stubs/init.py
+++ b/vcr/stubs/init.py
@@ -76,6 +76,14 @@ class VCRHTTPResponse(HTTPResponse):
        self._closed = False

        headers = self.recorded_response['headers']
+        # Since we are loading a response that has already been serialized, our
+        # response is no longer chunked.  That means we don't want any
+        # libraries trying to process a chunked response.  By removing the
+        # transfer-encoding: chunked header, this should cause the downstream
+        # libraries to process this as a non-chunked response.
+        te_key = [h for h in headers.keys() if h.upper() == 'TRANSFER-ENCODING']
+        if te_key:
+            del headers[te_key[0]]
        self.headers = self.msg = parse_headers(headers)

        self.length = compat.get_header(self.msg, 'content-length') or None
Author	SHA1	Message	Date
Kevin McCarthy	5cfb005b48	bump version	2015-05-05 22:22:37 -10:00
Kevin McCarthy	4ade547779	python3 uses capital headers sometimes, let's do a case-agnostic header removal	2015-05-05 21:59:48 -10:00
Kevin McCarthy	dc8eedf555	we dont actually need lxml for tests	2015-05-05 21:59:31 -10:00
Kevin McCarthy	5b9b6cd8b5	dont try to load chunked responses from cassettes, we already unchunked everything	2015-05-05 21:32:32 -10:00
Kevin McCarthy	856c38479a	add failing test for requests2.7/gzip issue	2015-05-05 20:49:12 -10:00
Kevin McCarthy	52496cd091	really add requests 2.7 to tox	2015-05-05 19:50:20 -10:00
Kevin McCarthy	bc26ce877a	add requests 2.7 to tox and travis	2015-05-05 19:44:19 -10:00
Kevin McCarthy	8db0d245a5	bump version	2015-04-11 11:21:31 -10:00
Kevin McCarthy	47544b08fe	Merge pull request #148 from ralphbean/master Ship extra bits with the pypi tarball.	2015-04-11 11:18:57 -10:00
Ralph Bean	4e560fc8db	Ship extra bits with the pypi tarball. This change should make new tarballs uploaded to pypi include various nice pieces: - The README - The LICENSE - The tests The text of the license actually specifies that the full text must be distributed with all copies of the software. So, you need it to be in compliance with the MIT license. The README is just nice to have, and the tests are particularly nice for my use case. I am packaging vcrpy for inclusion in the Fedora linux distribution and: - We like to use the tarball from pypi because it is the same source distribution that everyone else is using. - We like to run the tests before we build the rpm in our build system to make sure nothing crazy is going on. Of course, we can use the tarball for the source and then do a second step to clone the source and get the tests. But, this is more work than we like if we can just get the tests added to the tarball. Other distributions (like Debian) like this too.	2015-04-11 14:53:48 -04:00