Hello community, here is the log from the commit of package python-vcrpy for openSUSE:Factory checked in at 2018-12-31 09:47:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-vcrpy (Old) and /work/SRC/openSUSE:Factory/.python-vcrpy.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-vcrpy" Mon Dec 31 09:47:11 2018 rev:3 rq:662049 version:2.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-vcrpy/python-vcrpy.changes 2018-10-26 11:08:47.765839974 +0200 +++ /work/SRC/openSUSE:Factory/.python-vcrpy.new.28833/python-vcrpy.changes 2018-12-31 09:47:50.674144921 +0100 @@ -1,0 +2,7 @@ +Sat Dec 29 15:56:43 UTC 2018 - mar...@gmx.de + +- Add patch: + * python-vcrpy-fix-tunnel-uri-generation.patch + Needed for python-pyvmomi + +------------------------------------------------------------------- New: ---- python-vcrpy-fix-tunnel-uri-generation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-vcrpy.spec ++++++ --- /var/tmp/diff_new_pack.ZIG3Hk/_old 2018-12-31 09:47:51.106144566 +0100 +++ /var/tmp/diff_new_pack.ZIG3Hk/_new 2018-12-31 09:47:51.110144563 +0100 @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -26,6 +26,7 @@ Group: Development/Languages/Python URL: https://github.com/kevin1024/vcrpy Source: https://files.pythonhosted.org/packages/source/v/vcrpy/vcrpy-%{version}.tar.gz +Patch0: python-vcrpy-fix-tunnel-uri-generation.patch BuildRequires: %{python_module PyYAML} BuildRequires: %{python_module pytest-httpbin} BuildRequires: %{python_module pytest} @@ -58,6 +59,7 @@ %prep %setup -q -n vcrpy-%{version} +%patch0 -p1 %build %python_build ++++++ python-vcrpy-fix-tunnel-uri-generation.patch ++++++ >From a4e60d4bb10f49ec212ec89e9a632dc42e4fd477 Mon Sep 17 00:00:00 2001 From: "James E. King III" <jk...@apache.org> Date: Sat, 22 Dec 2018 17:21:25 +0000 Subject: [PATCH] properly handle tunnel connect uri generation broken in #389 --- tests/unit/test_request.py | 25 ++++++++++++++++--------- vcr/request.py | 5 ++++- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/tests/unit/test_request.py b/tests/unit/test_request.py index dfd68d7..00793f8 100644 --- a/tests/unit/test_request.py +++ b/tests/unit/test_request.py @@ -3,9 +3,13 @@ from vcr.request import Request, HeadersDict -def test_str(): - req = Request('GET', 'http://www.google.com/', '', {}) - str(req) == '<Request (GET) http://www.google.com/>' +@pytest.mark.parametrize("method, uri, expected_str", [ + ('GET', 'http://www.google.com/', '<Request (GET) http://www.google.com/>'), + ('OPTIONS', '*', '<Request (OPTIONS) *>'), + ('CONNECT', 'host.some.where:1234', '<Request (CONNECT) host.some.where:1234>') +]) +def test_str(method, uri, expected_str): + assert str(Request(method, uri, '', {})) == expected_str def test_headers(): @@ -29,18 +33,21 @@ def test_add_header_deprecated(): ('https://go.com/', 443), ('https://go.com:443/', 443), ('https://go.com:3000/', 3000), + ('*', None) ]) def test_port(uri, expected_port): req = Request('GET', uri, '', {}) assert req.port == expected_port -def test_uri(): - req = Request('GET', 'http://go.com/', '', {}) - assert req.uri == 'http://go.com/' - - req = Request('GET', 'http://go.com:80/', '', {}) - assert req.uri == 'http://go.com:80/' +@pytest.mark.parametrize("method, uri", [ + ('GET', 'http://go.com/'), + ('GET', 'http://go.com:80/'), + ('CONNECT', 'localhost:1234'), + ('OPTIONS', '*') +]) +def test_uri(method, uri): + assert Request(method, uri, '', {}).uri == uri def test_HeadersDict(): diff --git a/vcr/request.py b/vcr/request.py index e268053..dfd6d46 100644 --- a/vcr/request.py +++ b/vcr/request.py @@ -58,7 +58,10 @@ def port(self): parse_uri = urlparse(self.uri) port = parse_uri.port if port is None: - port = {'https': 443, 'http': 80}[parse_uri.scheme] + try: + port = {'https': 443, 'http': 80}[parse_uri.scheme] + except KeyError: + pass return port @property
