Merge ~ahasenack/ubuntu/+source/python-fysom:jammy-fix-py310-collections-import into ubuntu/+source/python-fysom:ubuntu/devel

[Andreas Hasenack]

Fix collections import in python 3.10

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/py310-collections (just amd64 for speed)

To test, run the dep8 test manually after installing the new package:

$ python3 debian/tests/import3
green

Submitted to debian via a bug report and salsa PR.

[Sergio Durigan Junior (sergiodj)]

I'll take a look at this one.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Andreas. Aside from the Applied-Upstream suggestion (which is the same comment I've made on the salsa MR), everything LGTM. Package builds & tests fine locally. +1

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 7911bd3..668b0b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-fysom (2.1.5-3ubuntu1) jammy; urgency=medium
+
+  * d/p/import_abc_from_collections_abc.patch: Fix collections import
+    for Python 3.10+ (LP: #1959907)
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 03 Feb 2022 14:34:40 -0300
+
 python-fysom (2.1.5-3) unstable; urgency=medium
 
   [ Marcin Kulisz ]
diff --git a/debian/control b/debian/control
index 589f74b..8f7c1db 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: python-fysom
-Maintainer: Marcin Kulisz <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Marcin Kulisz <[e-mail]>
 Section: python
 Priority: optional
 Build-Depends: debhelper-compat (= 12),
diff --git a/debian/patches/import_abc_from_collections_abc.patch b/debian/patches/import_abc_from_collections_abc.patch
new file mode 100644
index 0000000..4e3e461
--- /dev/null
+++ b/debian/patches/import_abc_from_collections_abc.patch
@@ -0,0 +1,55 @@
+From 1ed6950d2b683a9a2a2ab35dfd0ea79dc2963dc3 Mon Sep 17 00:00:00 2001
+From: Karthikeyan Singaravelan <[e-mail]>
+Date: Thu, 9 Apr 2020 14:32:14 +0000
+Subject: [PATCH] Import ABC from collections.abc instead of collections for
+ Python 3 compatibility.
+
+---
+ src/main/python/fysom/__init__.py | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+Origin: upstream, https://github.com/mriehl/fysom/commit/1ed6950d2b683a9a2a2ab35dfd0ea79dc2963dc3
+Bug: https://bugs.debian.org/1004913
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-fysom/+bug/1959907
+Last-Update: 2022-02-03
+Applied-Upstream: 2.1.6
+diff --git a/src/main/python/fysom/__init__.py b/src/main/python/fysom/__init__.py
+index 6458bbb..179512f 100644
+--- a/fysom/__init__.py
++++ b/fysom/__init__.py
+@@ -27,12 +27,16 @@
+ # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #
+ 
+-import collections
+ import functools
+ import weakref
+ import types
+ import sys
+ 
++try:
++    from collections.abc import Mapping
++except ImportError:
++    from collections import Mapping
++
+ __author__ = 'Mansour Behabadi'
+ __copyright__ = 'Copyright 2011, Mansour Behabadi and Jake Gordon'
+ __credits__ = ['Mansour Behabadi', 'Jake Gordon']
+@@ -159,7 +163,7 @@ def __init__(self, cfg={}, initial=None, events=None, callbacks=None,
+         # convert 3-tuples in the event specification to dicts
+         events_dicts = []
+         for e in cfg["events"]:
+-            if isinstance(e, collections.Mapping):
++            if isinstance(e, Mapping):
+                 events_dicts.append(e)
+             elif hasattr(e, "__iter__"):
+                 name, src, dst = list(e)[:3]
+@@ -520,7 +524,7 @@ def is_very_angry(self, event):
+         # convert 3-tuples in the event specification to dicts
+         events_dicts = []
+         for e in cfg["events"]:
+-            if isinstance(e, collections.Mapping):
++            if isinstance(e, Mapping):
+                 events_dicts.append(e)
+             elif hasattr(e, "__iter__"):
+                 name, src, dst = list(e)[:3]
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f4b8e53
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+import_abc_from_collections_abc.patch