From 23c99318e677808bee3cc7c30dd5ebc8f5f5ea9b Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 16 Feb 2018 11:21:25 -0500 Subject: [PATCH 1/2] cors: allow None to match missing headers this is apparently needed to run against newer versions of the requests library Signed-off-by: Casey Bodley --- s3tests/functional/test_s3.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py index 5044b09..a3bec75 100644 --- a/s3tests/functional/test_s3.py +++ b/s3tests/functional/test_s3.py @@ -5871,8 +5871,8 @@ def _cors_request_and_check(func, url, headers, expect_status, expect_allow_orig r = func(url, headers=headers) eq(r.status_code, expect_status) - assert r.headers['access-control-allow-origin'] == expect_allow_origin - assert r.headers['access-control-allow-methods'] == expect_allow_methods + assert r.headers.get('access-control-allow-origin', None) == expect_allow_origin + assert r.headers.get('access-control-allow-methods', None) == expect_allow_methods From 8c67aafcf2eac7d341ed7e8ae48d809e0068abb4 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 16 Feb 2018 11:28:31 -0500 Subject: [PATCH 2/2] requirements: unpin 'requests' from old v0.14 Signed-off-by: Casey Bodley --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index beced13..606e392 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ bunch >=1.0.0 # 0.14 switches to libev, that means bootstrap needs to change too gevent >=1.0 isodate >=0.4.4 -requests ==0.14.0 +requests >=0.14.0 pytz >=2011k ordereddict httplib2