Python 3.10 workaround
This commit is contained in:
parent
5b8bf18400
commit
407e53ae2c
37
py310.patch
37
py310.patch
@ -25,3 +25,40 @@ index 83f69783..d162d09c 100644
|
|||||||
_importer = _SixMetaPathImporter(__name__)
|
_importer = _SixMetaPathImporter(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
From 6483c19cb7f6029924bd1ad970dbcf04d3f4189d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Brett Cannon <brett@python.org>
|
||||||
|
Date: Fri, 26 Mar 2021 16:34:05 -0700
|
||||||
|
Subject: [PATCH] Implement find_spec() for _SixMetaPathImporter
|
||||||
|
|
||||||
|
---
|
||||||
|
six.py | 10 ++++++++++
|
||||||
|
1 file changed, 10 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/six.py b/six.py
|
||||||
|
index d162d09c..5e7f0ce4 100644
|
||||||
|
--- a/six.py
|
||||||
|
+++ b/six.py
|
||||||
|
@@ -71,6 +71,11 @@ def __len__(self):
|
||||||
|
MAXSIZE = int((1 << 63) - 1)
|
||||||
|
del X
|
||||||
|
|
||||||
|
+if PY34:
|
||||||
|
+ from importlib.util import spec_from_loader
|
||||||
|
+else:
|
||||||
|
+ spec_from_loader = None
|
||||||
|
+
|
||||||
|
|
||||||
|
def _add_doc(func, doc):
|
||||||
|
"""Add documentation to a function."""
|
||||||
|
@@ -186,6 +191,11 @@ def find_module(self, fullname, path=None):
|
||||||
|
return self
|
||||||
|
return None
|
||||||
|
|
||||||
|
+ def find_spec(self, fullname, path, target=None):
|
||||||
|
+ if fullname in self.known_modules:
|
||||||
|
+ return spec_from_loader(fullname, self)
|
||||||
|
+ return None
|
||||||
|
+
|
||||||
|
def __get_module(self, fullname):
|
||||||
|
try:
|
||||||
|
return self.known_modules[fullname]
|
||||||
|
@ -12,7 +12,12 @@ License: MIT
|
|||||||
URL: https://pypi.python.org/pypi/six
|
URL: https://pypi.python.org/pypi/six
|
||||||
Source0: %{pypi_source six}
|
Source0: %{pypi_source six}
|
||||||
|
|
||||||
# Backported from upstream PR: https://github.com/benjaminp/six/pull/343
|
# This patch is combination of two commits (PR's 343 & 352) needed
|
||||||
|
# to make python-six work with Python 3.10.
|
||||||
|
# Both of them were already merged into main branch so this can be
|
||||||
|
# removed once new version is released in upstream.
|
||||||
|
# https://github.com/benjaminp/six/pull/343
|
||||||
|
# https://github.com/benjaminp/six/pull/352
|
||||||
Patch0: py310.patch
|
Patch0: py310.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
Loading…
Reference in New Issue
Block a user