[neon/qt/pyside2/Neon/release] debian: Backport upstream change to stop using imp module.

[Dmitry Shachnev]

Git commit 1b3f6661670f765d11b1506d7e474c8fe810c550 by Dmitry Shachnev.
Committed on 25/01/2024 at 10:49.
Pushed by carlosdem into branch 'Neon/release'.

Backport upstream change to stop using imp module.

M  +2    -0    debian/changelog
A  +32   -0    debian/patches/Stop-using-imp-module.patch
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt/pyside2/-/commit/1b3f6661670f765d11b1506d7e474c8fe810c550

diff --git a/debian/changelog b/debian/changelog
index 42ea3207..40b7254c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 pyside2 (5.15.12-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Backport upstream change to stop using imp module.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 25 Jan 2024 13:48:45 +0300
 
diff --git a/debian/patches/Stop-using-imp-module.patch b/debian/patches/Stop-using-imp-module.patch
new file mode 100644
index 00000000..fd303c27
--- /dev/null
+++ b/debian/patches/Stop-using-imp-module.patch
@@ -0,0 +1,32 @@
+From: Friedemann Kleint <Friedemann.Kleint at qt.io>
+Date: Thu, 3 Sep 2020 11:14:55 +0200
+Subject: Stop using imp module
+
+Part of commit e796600c9663a26ccf1929aca8336eb0cb23fe5d.
+---
+ sources/shiboken2/tests/otherbinding/module_reload_test.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/sources/shiboken2/tests/otherbinding/module_reload_test.py b/sources/shiboken2/tests/otherbinding/module_reload_test.py
+index 368425c..c63af18 100644
+--- a/sources/shiboken2/tests/otherbinding/module_reload_test.py
++++ b/sources/shiboken2/tests/otherbinding/module_reload_test.py
+@@ -29,6 +29,7 @@
+ ##
+ #############################################################################
+ 
++from importlib import reload
+ import os
+ import shutil
+ import sys
+@@ -38,10 +39,6 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+ from shiboken_paths import init_paths
+ init_paths()
+ 
+-from py3kcompat import IS_PY3K
+-
+-if IS_PY3K:
+-    from imp import reload
+ 
+ orig_path = os.path.join(os.path.dirname(__file__))
+ workdir = os.getcwd()
diff --git a/debian/patches/series b/debian/patches/series
index f003f0ae..f5ce1f26 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ Fix-tests-sample_privatector-sample_privatedtor-failing-w.patch
 Python-3.12-Fix-the-structure-of-class-property.patch
 Support-running-PySide-on-Python-3.12.patch
 Final-details-to-enable-3.12-wheel-compatibility.patch
+Stop-using-imp-module.patch