From 4b4be7f661cf6ad45bb232c936dfde297d727627 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 24 Mar 2015 14:08:31 -0700 Subject: [PATCH] Don't use 2.7+ style ',' separated with. --- tests/integration/test_requests.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/integration/test_requests.py b/tests/integration/test_requests.py index da40239..fc22198 100644 --- a/tests/integration/test_requests.py +++ b/tests/integration/test_requests.py @@ -203,13 +203,16 @@ def test_nested_cassettes_with_session_created_before_nesting(scheme, tmpdir): def test_post_file(tmpdir, scheme): '''Ensure that we handle posting a file.''' url = scheme + '://httpbin.org/post' - with vcr.use_cassette(str(tmpdir.join('post_file.yaml'))) as cass, open('tox.ini') as f: - original_response = requests.post(url, f).content + with vcr.use_cassette(str(tmpdir.join('post_file.yaml'))) as cass: + # Don't use 2.7+ only style ',' separated with here because we support python 2.6 + with open('tox.ini') as f: + original_response = requests.post(url, f).content # This also tests that we do the right thing with matching the body when they are files. with vcr.use_cassette(str(tmpdir.join('post_file.yaml')), - match_on=('method', 'scheme', 'host', 'port', 'path', 'query', 'body')) as cass, open('tox.ini') as f: - tox_content = f.read() + match_on=('method', 'scheme', 'host', 'port', 'path', 'query', 'body')) as cass: + with open('tox.ini') as f: + tox_content = f.read() assert cass.requests[0].body.read() == tox_content with open('tox.ini') as f: new_response = requests.post(url, f).content