From 6d389a58ffbf6d889bec2b1affe4537e790fc6dacb45a05db429b3da7612b70c Mon Sep 17 00:00:00 2001
From: Daniel Garcia <daniel.garcia@suse.com>
Date: Fri, 9 Dec 2022 10:42:40 +0000
Subject: [PATCH] Accepting request 1041370 from home:pgajdos:python

- do not require six
- added patches
  fix https://github.com/kevin1024/pytest-httpbin/issues/75
  + python-pytest-httpbin-no-six.patch

OBS-URL: https://build.opensuse.org/request/show/1041370
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-httpbin?expand=0&rev=9
---
 python-pytest-httpbin-no-six.patch | 13 +++++++++++++
 python-pytest-httpbin.changes      |  8 ++++++++
 python-pytest-httpbin.spec         |  5 +++--
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 python-pytest-httpbin-no-six.patch

diff --git a/python-pytest-httpbin-no-six.patch b/python-pytest-httpbin-no-six.patch
new file mode 100644
index 0000000..9b4bd0c
--- /dev/null
+++ b/python-pytest-httpbin-no-six.patch
@@ -0,0 +1,13 @@
+Index: pytest-httpbin-1.0.2/pytest_httpbin/serve.py
+===================================================================
+--- pytest-httpbin-1.0.2.orig/pytest_httpbin/serve.py
++++ pytest-httpbin-1.0.2/pytest_httpbin/serve.py
+@@ -3,7 +3,7 @@ import threading
+ import ssl
+ from wsgiref.simple_server import WSGIServer, make_server, WSGIRequestHandler
+ from wsgiref.handlers import SimpleHandler
+-from six.moves.urllib.parse import urljoin
++from urllib.parse import urljoin
+ 
+ 
+ CERT_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'certs')
diff --git a/python-pytest-httpbin.changes b/python-pytest-httpbin.changes
index c39edd1..c2baca4 100644
--- a/python-pytest-httpbin.changes
+++ b/python-pytest-httpbin.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Dec  8 11:15:36 UTC 2022 - pgajdos@suse.com
+
+- do not require six
+- added patches
+  fix https://github.com/kevin1024/pytest-httpbin/issues/75
+  + python-pytest-httpbin-no-six.patch
+
 -------------------------------------------------------------------
 Tue Apr 12 20:57:41 UTC 2022 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-pytest-httpbin.spec b/python-pytest-httpbin.spec
index a2140d0..cc29c0b 100644
--- a/python-pytest-httpbin.spec
+++ b/python-pytest-httpbin.spec
@@ -26,16 +26,16 @@ Group:          Development/Languages/Python
 URL:            https://github.com/kevin1024/pytest-httpbin
 Source:         https://files.pythonhosted.org/packages/source/p/pytest-httpbin/pytest-httpbin-%{version}.tar.gz
 Source99:       pytest-httpbin-rpmlintrc
+# https://github.com/kevin1024/pytest-httpbin/issues/75
+Patch0:         python-pytest-httpbin-no-six.patch
 BuildRequires:  %{python_module httpbin}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module requests}
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module six}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-httpbin
 Requires:       python-pytest
-Requires:       python-six
 BuildArch:      noarch
 %python_subpackages
 
@@ -50,6 +50,7 @@ fixture.
 
 %prep
 %setup -q -n pytest-httpbin-%{version}
+%patch0 -p1
 
 %build
 %python_build