Avoid using the deprecated "imp" module (removed in Python 3.12)
This commit is contained in:
parent
4391bca196
commit
a1fda59562
32
07db761f9f.patch
Normal file
32
07db761f9f.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
From 07db761f9f027d1814a43686cda6fca26e37a931 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stefan Behnel <stefan_ml@behnel.de>
|
||||||
|
Date: Thu, 11 May 2023 10:29:02 +0200
|
||||||
|
Subject: [PATCH] Avoid using the deprecated "imp" module.
|
||||||
|
|
||||||
|
Closes https://bugs.launchpad.net/lxml/+bug/2018137
|
||||||
|
---
|
||||||
|
src/lxml/html/tests/test_html5parser.py | 6 ++++--
|
||||||
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/lxml/html/tests/test_html5parser.py b/src/lxml/html/tests/test_html5parser.py
|
||||||
|
index 56afe98b7..bcf7f1b12 100644
|
||||||
|
--- a/src/lxml/html/tests/test_html5parser.py
|
||||||
|
+++ b/src/lxml/html/tests/test_html5parser.py
|
||||||
|
@@ -1,5 +1,4 @@
|
||||||
|
import os
|
||||||
|
-import imp
|
||||||
|
try:
|
||||||
|
from StringIO import StringIO
|
||||||
|
except ImportError: # python 3
|
||||||
|
@@ -45,7 +44,10 @@ def find_module(self, fullname, path=None):
|
||||||
|
return None
|
||||||
|
|
||||||
|
def load_module(self, fullname):
|
||||||
|
- mod = sys.modules.setdefault(fullname, imp.new_module(fullname))
|
||||||
|
+ fake_module = object()
|
||||||
|
+ fake_module.__qualname__ = fullname
|
||||||
|
+ fake_module.__name__ = fullname.rsplit('.', 1)[-1]
|
||||||
|
+ mod = sys.modules.setdefault(fullname, fake_module)
|
||||||
|
mod.__file__, mod.__loader__, mod.__path__ = "<dummy>", self, []
|
||||||
|
mod.__dict__.update(self.mocks[fullname])
|
||||||
|
return mod
|
||||||
24
c6b7e621e4.patch
Normal file
24
c6b7e621e4.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
From c6b7e621e4696c02bf8f6ea423ffbbf2109748ab Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stefan Behnel <stefan_ml@behnel.de>
|
||||||
|
Date: Thu, 11 May 2023 10:30:15 +0200
|
||||||
|
Subject: [PATCH] Avoid using the deprecated "imp" module.
|
||||||
|
|
||||||
|
Closes https://bugs.launchpad.net/lxml/+bug/2018137
|
||||||
|
---
|
||||||
|
src/lxml/html/tests/test_html5parser.py | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/lxml/html/tests/test_html5parser.py b/src/lxml/html/tests/test_html5parser.py
|
||||||
|
index bcf7f1b12..57878a5e3 100644
|
||||||
|
--- a/src/lxml/html/tests/test_html5parser.py
|
||||||
|
+++ b/src/lxml/html/tests/test_html5parser.py
|
||||||
|
@@ -44,7 +44,8 @@ def find_module(self, fullname, path=None):
|
||||||
|
return None
|
||||||
|
|
||||||
|
def load_module(self, fullname):
|
||||||
|
- fake_module = object()
|
||||||
|
+ class Cls: pass
|
||||||
|
+ fake_module = Cls()
|
||||||
|
fake_module.__qualname__ = fullname
|
||||||
|
fake_module.__name__ = fullname.rsplit('.', 1)[-1]
|
||||||
|
mod = sys.modules.setdefault(fullname, fake_module)
|
||||||
@ -20,6 +20,10 @@ Source1: get-lxml-source.sh
|
|||||||
# Upstream issue: https://bugs.launchpad.net/lxml/+bug/2016939
|
# Upstream issue: https://bugs.launchpad.net/lxml/+bug/2016939
|
||||||
Patch: Skip-failing-test-test_html_prefix_nsmap.patch
|
Patch: Skip-failing-test-test_html_prefix_nsmap.patch
|
||||||
|
|
||||||
|
# Avoid using the deprecated "imp" module (removed in Python 3.12)
|
||||||
|
Patch: https://github.com/lxml/lxml/commit/07db761f9f.patch
|
||||||
|
Patch: https://github.com/lxml/lxml/commit/c6b7e621e4.patch
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
BuildRequires: libxslt-devel
|
BuildRequires: libxslt-devel
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user