From 7d4cdeea0b25e9b8ef7382c908f931ae4d9571a3 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Wed, 16 Dec 2020 21:40:21 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/python-six.git#831abd902393897c48e07dff35bf69fc224ca50e
---
 py310.patch     | 27 +++++++++++++++++++++++++++
 python-six.spec | 10 ++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 py310.patch

diff --git a/py310.patch b/py310.patch
new file mode 100644
index 0000000..ae8987e
--- /dev/null
+++ b/py310.patch
@@ -0,0 +1,27 @@
+From a6ac88fa03735e94938693c354f28937e1e51ab7 Mon Sep 17 00:00:00 2001
+From: Victor Stinner <vstinner@python.org>
+Date: Mon, 14 Dec 2020 14:02:29 +0100
+Subject: [PATCH] Port _SixMetaPathImporter to Python 3.10
+
+Fixes #341.
+---
+ six.py | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/six.py b/six.py
+index 83f69783..d162d09c 100644
+--- a/six.py
++++ b/six.py
+@@ -223,6 +223,12 @@ def get_code(self, fullname):
+         return None
+     get_source = get_code  # same as get_code
+ 
++    def create_module(self, spec):
++        return self.load_module(spec.name)
++
++    def exec_module(self, module):
++        pass
++
+ _importer = _SixMetaPathImporter(__name__)
+ 
+ 
diff --git a/python-six.spec b/python-six.spec
index e7face9..ab12dec 100644
--- a/python-six.spec
+++ b/python-six.spec
@@ -16,13 +16,16 @@
 
 Name:           python-%{modname}
 Version:        1.15.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python 2 and 3 compatibility utilities
 
 License:        MIT
 URL:            https://pypi.python.org/pypi/six
 Source0:        %{pypi_source %{modname}}
 
+# Backported from upstream PR: https://github.com/benjaminp/six/pull/343
+Patch0:         py310.patch
+
 BuildArch:      noarch
 
 %global _description \
@@ -67,7 +70,7 @@ Python 3 version.
 
 
 %prep
-%autosetup -n %{modname}-%{version}
+%autosetup -p1 -n %{modname}-%{version}
 
 
 %build
@@ -111,6 +114,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-3 -rfsxX test_six.py
 
 
 %changelog
+* Mon Dec 14 2020 Lumír Balhar <lbalhar@redhat.com> - 1.15.0-3
+- Fix compatibility with Python 3.10
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild