Merge ~ahasenack/ubuntu/+source/pythonpy:jammy-py310-collections-import into ubuntu/+source/pythonpy:ubuntu/devel

[Andreas Hasenack]

Another python 3.10 collections import fix.

Upstream is gone, there is just the pypi page[1] but the "homepage" link[2] is 404.

Debian VCS tags from d/control[3] are also gone.

To test, just run:

$ py "3 * 2"
6

And this, with the patches applied (dquilt push -a):
$ python3 -m unittest discover -v
test_empty (test.test_pythonpy.TestPythonPy) ... ok
test_ignore_errors (test.test_pythonpy.TestPythonPy) ... ok
test_imports (test.test_pythonpy.TestPythonPy) ... ok
test_numbers (test.test_pythonpy.TestPythonPy) ... ok
test_range (test.test_pythonpy.TestPythonPy) ... ok
test_split_input (test.test_pythonpy.TestPythonPy) ... ok
test_split_output (test.test_pythonpy.TestPythonPy) ... ok
test_statements (test.test_pythonpy.TestPythonPy) ... ok

----------------------------------------------------------------------
Ran 8 tests in 1.188s

Debian bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1004971
PPA: thttps://launchpad.net/~ahasenack/+archive/ubuntu/py310-collections/+packages

[Lucas Kanashiro (lucaskanashiro)]

LGTM, +1.

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, uploaded

diff --git a/debian/changelog b/debian/changelog
index 6dc01d6..7e3dc4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pythonpy (0.4.11b-3ubuntu1) jammy; urgency=medium
+
+  * d/p/0003-py310-collections-import.patch: fix collections import
+    under python 3.10+ (LP: #1878935)
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 04 Feb 2022 14:37:46 +0000
+
 pythonpy (0.4.11b-3) unstable; urgency=medium
 
   * Avoid 'pycompleter' as a system-wide executable:
diff --git a/debian/control b/debian/control
index 0cadb15..e62ab35 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: pythonpy
 Section: utils
 Priority: optional
-Maintainer: Tiago Ilieve <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Tiago Ilieve <[e-mail]>
 Build-Depends: bash-completion,
                debhelper (>= 9),
                dh-python,
diff --git a/debian/patches/0003-py310-collections-import.patch b/debian/patches/0003-py310-collections-import.patch
new file mode 100644
index 0000000..7de4027
--- /dev/null
+++ b/debian/patches/0003-py310-collections-import.patch
@@ -0,0 +1,25 @@
+Description: fix collections import under py3.10+
+ In python 3.10[1] deprecated aliases to Collections Abstract Base Classes from
+ the collections module have been removed. These imports must be done from
+ collections.abc.
+ .
+ 1. https://docs.python.org/3/whatsnew/3.10.html
+Author: Daniel Franklin <https://launchpad.net/~dzfranklin>
+Origin: other, https://bugs.launchpad.net/ubuntu/+source/pythonpy/+bug/1878935/comments/1
+Bug-Debian: https://bugs.debian.org/1004971
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/pythonpy/+bug/1878935
+Forwarded: no, upstream is gone
+Last-Update: 2022-02-04
+diff --git a/pythonpy/__main__.py b/pythonpy/__main__.py
+index 8602b28..7fa3733 100755
+--- a/pythonpy/__main__.py
++++ b/pythonpy/__main__.py
+@@ -13,7 +13,7 @@ signal(SIGPIPE,SIG_DFL)
+ import argparse
+ import json
+ import re
+-from collections import Iterable
++from collections.abc import Iterable
+ 
+ try:
+     from . import __version__
diff --git a/debian/patches/series b/debian/patches/series
index 48edd71..7435bb6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-remove-entry-points-scripts.patch
 0002-fix-bash-completion.patch
+0003-py310-collections-import.patch