[Python-modules-team] Bug#1001344: jaraco.itertools: needs update for python3.10: 'collections' has no attribute 'Mapping'

[Steve Langasek]

Package: jaraco.itertools
Version: 2.0.1-4
Followup-For: Bug #1001344
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu jammy ubuntu-patch
Control: tags -1 patch

Please find attached a patch for this issue.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                   https://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
diff -Nru jaraco.itertools-2.0.1/debian/patches/python-3.10.patch jaraco.itertools-2.0.1/debian/patches/python-3.10.patch
--- jaraco.itertools-2.0.1/debian/patches/python-3.10.patch	1969-12-31 16:00:00.000000000 -0800
+++ jaraco.itertools-2.0.1/debian/patches/python-3.10.patch	2021-12-10 15:25:54.000000000 -0800
@@ -0,0 +1,28 @@
+Description: compatibility with python 3.10
+Author: Steve Langasek <steve.langasek at ubuntu.com>
+Bug-Debian: https://bugs.debian.org/1001344
+Last-Update: 2021-12-10
+Forwarded: no
+
+Index: jaraco.itertools-2.0.1/jaraco/itertools.py
+===================================================================
+--- jaraco.itertools-2.0.1.orig/jaraco/itertools.py
++++ jaraco.itertools-2.0.1/jaraco/itertools.py
+@@ -102,7 +102,7 @@
+ 	def __init__(self, sequence, func = lambda x: x):
+ 		self.sequence = iter(sequence)
+ 		self.func = func
+-		self.queues = collections.OrderedDict()
++		self.queues = collections.abc.OrderedDict()
+ 
+ 	def __getitem__(self, key):
+ 		try:
+@@ -863,7 +863,7 @@
+ 		item = ()
+ 	singleton = (
+ 		isinstance(item, six.string_types)
+-		or isinstance(item, collections.Mapping)
++		or isinstance(item, collections.abc.Mapping)
+ 		or not hasattr(item, '__iter__')
+ 	)
+ 	return (item,) if singleton else item
diff -Nru jaraco.itertools-2.0.1/debian/patches/series jaraco.itertools-2.0.1/debian/patches/series
--- jaraco.itertools-2.0.1/debian/patches/series	2019-08-03 12:41:53.000000000 -0700
+++ jaraco.itertools-2.0.1/debian/patches/series	2021-12-10 15:24:40.000000000 -0800
@@ -1 +1,2 @@
 Python3.7-support.patch
+python-3.10.patch