Bug#988628: unblock: six/1.16.0-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: cjwatson@debian.org
Control: block 988418 with -1
Please unblock package six
There is a new six in unstable that python-pip built against, it needs
to migrate for pip to be able to.
[ Reason ]
New upstream release, with minor improvement for Python 3.10.
[ Impact ]
python-pip won't migrate (#988418).
[ Tests ]
Upstream tests are run at build. But the changed code isn't covered by
any new tests.
[ Risks ]
Minimal changes in a very stable library.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
unblock six/1.16.0-1
diff -Nru six-1.15.0/CHANGES six-1.16.0/CHANGES
--- six-1.15.0/CHANGES 2020-05-21 11:25:33.000000000 -0400
+++ six-1.16.0/CHANGES 2021-05-05 10:17:58.000000000 -0400
@@ -3,6 +3,12 @@
This file lists the changes in each six version.
+1.16.0
+------
+
+- Pull request #343, issue #341, pull request #349: Port _SixMetaPathImporter to
+ Python 3.10.
+
1.15.0
------
@@ -100,7 +106,7 @@
- Issue #98: Fix `six.moves` race condition in multi-threaded code.
-- Pull request #51: Add `six.view(keys|values|itmes)`, which provide dictionary
+- Pull request #51: Add `six.view(keys|values|items)`, which provide dictionary
views on Python 2.7+.
- Issue #112: `six.moves.reload_module` now uses the importlib module on
@@ -227,7 +233,7 @@
- Issue #40: Add import mapping for the Python 2 gdbm module.
- Issue #35: On Python versions less than 2.7, print_ now encodes unicode
- strings when outputing to standard streams. (Python 2.7 handles this
+ strings when outputting to standard streams. (Python 2.7 handles this
automatically.)
1.4.1
diff -Nru six-1.15.0/debian/changelog six-1.16.0/debian/changelog
--- six-1.15.0/debian/changelog 2020-11-09 20:16:45.000000000 -0400
+++ six-1.16.0/debian/changelog 2021-05-09 06:40:54.000000000 -0400
@@ -1,3 +1,9 @@
+six (1.16.0-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Colin Watson <cjwatson@debian.org> Sun, 09 May 2021 11:40:54 +0100
+
six (1.15.0-2) unstable; urgency=medium
[ Ondřej Nový ]
diff -Nru six-1.15.0/PKG-INFO six-1.16.0/PKG-INFO
--- six-1.15.0/PKG-INFO 2020-05-21 11:25:53.508234700 -0400
+++ six-1.16.0/PKG-INFO 2021-05-05 10:18:16.777235000 -0400
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: six
-Version: 1.15.0
+Version: 1.16.0
Summary: Python 2 and 3 compatibility utilities
Home-page: https://github.com/benjaminp/six
Author: Benjamin Peterson
diff -Nru six-1.15.0/six.egg-info/PKG-INFO six-1.16.0/six.egg-info/PKG-INFO
--- six-1.15.0/six.egg-info/PKG-INFO 2020-05-21 11:25:53.000000000 -0400
+++ six-1.16.0/six.egg-info/PKG-INFO 2021-05-05 10:18:16.000000000 -0400
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: six
-Version: 1.15.0
+Version: 1.16.0
Summary: Python 2 and 3 compatibility utilities
Home-page: https://github.com/benjaminp/six
Author: Benjamin Peterson
diff -Nru six-1.15.0/six.py six-1.16.0/six.py
--- six-1.15.0/six.py 2020-05-21 11:25:33.000000000 -0400
+++ six-1.16.0/six.py 2021-05-05 10:17:58.000000000 -0400
@@ -29,7 +29,7 @@
import types
__author__ = "Benjamin Peterson <benjamin@python.org>"
-__version__ = "1.15.0"
+__version__ = "1.16.0"
# Useful for very coarse version differentiation.
@@ -71,6 +71,11 @@
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 @@
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]
@@ -223,6 +233,12 @@
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__)
Reply to: