From ad843d56150e997e58580970faf76e9abeca9c40 Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jcline@redhat.com>
Date: May 23 2019 19:46:49 +0000
Subject: Pick up Miro's pytest 4 fix


---

diff --git a/python-requests.spec b/python-requests.spec
index e146a21..d7b17dc 100644
--- a/python-requests.spec
+++ b/python-requests.spec
@@ -36,6 +36,9 @@ Patch4:         Don-t-inject-pyopenssl-into-urllib3.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1653223
 Patch5:         requests-2.20.0-no-py2-httpbin.patch
 
+# https://github.com/kennethreitz/requests/pull/5049
+Patch6:         support-pytest-4.patch
+
 BuildArch:      noarch
 
 %description
diff --git a/support-pytest-4.patch b/support-pytest-4.patch
new file mode 100644
index 0000000..dd00e4a
--- /dev/null
+++ b/support-pytest-4.patch
@@ -0,0 +1,26 @@
+From 7a33a8e523be6aa40c7e5435d3c5d92f2cc6e9a0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Mon, 8 Apr 2019 18:04:22 +0200
+Subject: [PATCH] Support pytest 4
+
+Fixes https://github.com/kennethreitz/requests/issues/5048
+
+See https://docs.pytest.org/en/latest/deprecations.html#marks-in-pytest-mark-parametrize
+---
+ tests/test_utils.py |  3 ++-
+ 1 file changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/tests/test_utils.py b/tests/test_utils.py
+index 59b0b0efa..62c51494d 100644
+--- a/tests/test_utils.py
++++ b/tests/test_utils.py
+@@ -33,7 +33,8 @@ class TestSuperLen:
+         'stream, value', (
+             (StringIO.StringIO, 'Test'),
+             (BytesIO, b'Test'),
+-            pytest.mark.skipif('cStringIO is None')((cStringIO, 'Test')),
++            pytest.param(cStringIO, 'Test',
++                         marks=pytest.mark.skipif('cStringIO is None')),
+         ))
+     def test_io_streams(self, stream, value):
+         """Ensures that we properly deal with different kinds of IO streams."""