blob: 27609131fc5994e95065edb21512a953e464e0ab (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
Subject: [PATCH] Replace imp with importlib.machinery
The imp was removed in Python 3.12 [1]. This commit replaces
get_suffixes() method call with _SUFFIXES array from imprtlib.machinery.
[1] https://github.com/python/cpython/issues/98040
---
This is original patch submitted to Github mirror, it was later resubmitted to
upstream Gerrit, where they are taking care of Python2.7. We can stick with
this version of patch for now because we don't care about py2.7 anymore.
Original-PR: https://github.com/openstack/pbr/pull/22
Upstream-PR: https://review.opendev.org/c/openstack/pbr/+/884789
diff --git a/pbr/tests/test_packaging.py b/pbr/tests/test_packaging.py
index c719d1e..068bab7 100644
--- a/pbr/tests/test_packaging.py
+++ b/pbr/tests/test_packaging.py
@@ -40,7 +40,7 @@
import email
import email.errors
-import imp
+import importlib
import os
import re
import sysconfig
@@ -1217,7 +1217,7 @@ def get_soabi():
# NOTE(sigmavirus24): PyPy only added support for the SOABI config var
# to sysconfig in 2015. That was well after 2.2.1 was published in the
# Ubuntu 14.04 archive.
- for suffix, _, _ in imp.get_suffixes():
+ for suffix, _, _ in importlib.machinery._SUFFIXES:
if suffix.startswith('.pypy') and suffix.endswith('.so'):
soabi = suffix.split('.')[1]
break
--
2.39.2
|
