From 12affebae8882362bfcf4e52105d1a22088460e034020c9f5614dcebe2fa7e9c Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Tue, 21 Mar 2023 20:43:52 +0000
Subject: [PATCH] Accepting request 1073518 from home:pgajdos:python

- do not require python-six
- added patches
  fix https://github.com/cherrypy/cheroot/commit/f3170d40a699219345abb5813395ff39319fec86
  + python-cheroot-no-six.patch

OBS-URL: https://build.opensuse.org/request/show/1073518
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cheroot?expand=0&rev=52
---
 python-cheroot-no-six.patch | 22 ++++++++++++++++++++++
 python-cheroot.changes      |  8 ++++++++
 python-cheroot.spec         |  5 ++---
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 python-cheroot-no-six.patch

diff --git a/python-cheroot-no-six.patch b/python-cheroot-no-six.patch
new file mode 100644
index 0000000..664d9ea
--- /dev/null
+++ b/python-cheroot-no-six.patch
@@ -0,0 +1,22 @@
+index 8ff3b02ced..b4030da6fd 100644
+--- a/cheroot/test/_pytest_plugin.py
++++ b/cheroot/test/_pytest_plugin.py
+@@ -8,7 +8,6 @@
+ __metaclass__ = type
+ 
+ import pytest
+-import six
+ 
+ 
+ pytest_version = tuple(map(int, pytest.__version__.split('.')))
+@@ -46,9 +45,6 @@ def pytest_load_initial_conftests(early_config, parser, args):
+         'pytest.PytestUnraisableExceptionWarning:_pytest.unraisableexception',
+     ))
+ 
+-    if six.PY2:
+-        return
+-
+     # NOTE: `ResourceWarning` does not exist under Python 2 and so using
+     # NOTE: it in warning filters results in an `_OptionError` exception
+     # NOTE: being raised.
+
diff --git a/python-cheroot.changes b/python-cheroot.changes
index d53f329..0267581 100644
--- a/python-cheroot.changes
+++ b/python-cheroot.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Mar 21 10:34:26 UTC 2023 - pgajdos@suse.com
+
+- do not require python-six
+- added patches
+  fix https://github.com/cherrypy/cheroot/commit/f3170d40a699219345abb5813395ff39319fec86
+  + python-cheroot-no-six.patch
+
 -------------------------------------------------------------------
 Mon Jan  2 18:19:04 UTC 2023 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-cheroot.spec b/python-cheroot.spec
index 861f0d0..1f8a3ed 100644
--- a/python-cheroot.spec
+++ b/python-cheroot.spec
@@ -23,7 +23,6 @@
 %endif
 
 %define pypi_name cheroot
-%define skip_python2 1
 %bcond_with ringdisabled
 Name:           python-%{pypi_name}
 Version:        9.0.0
@@ -38,6 +37,8 @@ Source99:       cheroot.rpmlintrc
 Patch0:         no-pypytools.patch
 # PATCH-FIX-UPSTREAM no-relative-imports.patch bsc#[0-9]+ mcepl@suse.com
 Patch1:         no-relative-imports.patch
+# https://github.com/cherrypy/cheroot/commit/f3170d40a699219345abb5813395ff39319fec86
+Patch2:         python-cheroot-no-six.patch
 BuildRequires:  %{python_module base >= 3.6}
 BuildRequires:  %{python_module importlib-metadata if %python-base < 3.8}
 BuildRequires:  %{python_module jaraco.functools}
@@ -46,7 +47,6 @@ BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools >= 34.4}
 BuildRequires:  %{python_module setuptools_scm >= 1.15.0}
 BuildRequires:  %{python_module setuptools_scm_git_archive >= 1.0}
-BuildRequires:  %{python_module six >= 1.11.0}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros >= 20210929
@@ -71,7 +71,6 @@ BuildRequires:  %{python_module urllib3 >= 1.25}
 # /SECTION
 Requires:       python-jaraco.functools
 Requires:       python-more-itertools >= 2.6
-Requires:       python-six >= 1.11.0
 %if 0%{python_version_nodots} < 38
 Requires:       python-importlib-metadata
 %endif