2 files changed, 35 insertions, 36 deletions
diff --git a/dev-python/bottle/files/bottle-0.12.25-py312.patch b/dev-python/bottle/files/bottle-0.12.25-py312.patch
new file mode 100644
index 000000000000..717463841af5
--- /dev/null
+++ b/dev-python/bottle/files/bottle-0.12.25-py312.patch
@@ -0,0 +1,35 @@
+From ca6762c559c5e71e0dff71dc97eb4c6b3ed9bbcd Mon Sep 17 00:00:00 2001
+From: Marcel Hellkamp <marc@gsites.de>
+Date: Sun, 12 Jun 2022 15:15:35 +0200
+Subject: [PATCH] Fix #1378: Module loader should move from find_mdoule to
+ find_spec.
+
+---
+ bottle.py | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/bottle.py b/bottle.py
+index 8e7e3d7..63e55cf 100755
+--- a/bottle.py
++++ b/bottle.py
+@@ -2068,10 +2068,15 @@ class _ImportRedirect(object):
+         })
+         sys.meta_path.append(self)
+ 
++    def find_spec(self, fullname, path, target=None):
++        if '.' not in fullname: return
++        if fullname.rsplit('.', 1)[0] != self.name: return
++        from importlib.util import spec_from_loader
++        return spec_from_loader(fullname, self)
++
+     def find_module(self, fullname, path=None):
+         if '.' not in fullname: return
+-        packname = fullname.rsplit('.', 1)[0]
+-        if packname != self.name: return
++        if fullname.rsplit('.', 1)[0] != self.name: return
+         return self
+ 
+     def load_module(self, fullname):
+-- 
+2.40.1
+
diff --git a/dev-python/bottle/files/bottle-0.12.8-py3.5-backport.patch b/dev-python/bottle/files/bottle-0.12.8-py3.5-backport.patch
deleted file mode 100644
index 86e1ac04bc41..000000000000
--- a/dev-python/bottle/files/bottle-0.12.8-py3.5-backport.patch
+++ /dev/null
@@ -1,36 +0,0 @@
- test/test_environ.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/test_environ.py b/test/test_environ.py
-old mode 100755
-new mode 100644
-index 2b8079b..2feebe3
---- a/test/test_environ.py
-+++ b/test/test_environ.py
-@@ -592,7 +592,7 @@ class TestResponse(unittest.TestCase):
-         r.set_cookie('name2', 'value', max_age=datetime.timedelta(days=1))
-         cookies = sorted([value for name, value in r.headerlist
-                    if name.title() == 'Set-Cookie'])
--        self.assertEqual(cookies[0], 'name1=value; Max-Age=5')
-+        self.assertEqual(cookies[0].lower(), 'name1=value; max-age=5')
-         self.assertEqual(cookies[1], 'name2=value; Max-Age=86400')
- 
-     def test_set_cookie_expires(self):
-@@ -602,7 +602,7 @@ class TestResponse(unittest.TestCase):
-         r.set_cookie('name2', 'value', expires=datetime.datetime(1970,1,1,0,0,43))
-         cookies = sorted([value for name, value in r.headerlist
-                    if name.title() == 'Set-Cookie'])
--        self.assertEqual(cookies[0], 'name1=value; expires=Thu, 01 Jan 1970 00:00:42 GMT')
-+        self.assertEqual(cookies[0].lower(), 'name1=value; expires=thu, 01 jan 1970 00:00:42 gmt')
-         self.assertEqual(cookies[1], 'name2=value; expires=Thu, 01 Jan 1970 00:00:43 GMT')
- 
-     def test_delete_cookie(self):
-@@ -611,7 +611,7 @@ class TestResponse(unittest.TestCase):
-         response.delete_cookie('name')
-         cookies = [value for name, value in response.headerlist
-                    if name.title() == 'Set-Cookie']
--        self.assertTrue('name=;' in cookies[0])
-+        self.assertTrue('Max-Age=-1' in cookies[0])
- 
-     def test_set_header(self):
-         response = BaseResponse()