Merging upstream version 2.1.2~dev0+20231127.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 6 insertions, 3 deletions

diff --git a/deluge/plugins/Blocklist/deluge_blocklist/data/blocklist_import24.png b/deluge/plugins/Blocklist/deluge_blocklist/data/blocklist_import24.png
index 9441214..f1a02e7 100644
--- a/deluge/plugins/Blocklist/deluge_blocklist/data/blocklist_import24.png
+++ b/deluge/plugins/Blocklist/deluge_blocklist/data/blocklist_import24.png
diff --git a/deluge/plugins/Stats/deluge_stats/gtkui.py b/deluge/plugins/Stats/deluge_stats/gtkui.py
index c088060..39c1d4c 100644
--- a/deluge/plugins/Stats/deluge_stats/gtkui.py
+++ b/deluge/plugins/Stats/deluge_stats/gtkui.py
@@ -9,10 +9,13 @@
 # This file is part of Deluge and is licensed under GNU General Public License 3.0, or later, with
 # the additional special exception to link portions of this program with the OpenSSL library.
 # See LICENSE for more details.
-#
 
 import logging
 
+import gi  # isort:skip (Required before Gtk import).
+
+gi.require_version('Gtk', '3.0')
+
 from gi.repository import Gtk
 from gi.repository.Gdk import RGBA
 
diff --git a/deluge/plugins/Stats/deluge_stats/tests/test_stats.py b/deluge/plugins/Stats/deluge_stats/tests/test_stats.py
index 4aefc50..d61cd46 100644
--- a/deluge/plugins/Stats/deluge_stats/tests/test_stats.py
+++ b/deluge/plugins/Stats/deluge_stats/tests/test_stats.py
@@ -58,7 +58,7 @@ class TestStatsPlugin:
 
     @pytest.mark.gtkui
     @defer.inlineCallbacks
-    def test_write(self):
+    def test_write(self, tmp_path):
         """
         writing to a file-like object; need this for webui.
 
@@ -102,5 +102,5 @@ class TestStatsPlugin:
         file_like = FakeFile()
         surface.write_to_png(file_like)
         data = b''.join(file_like.data)
-        with open('file_like.png', 'wb') as _file:
+        with open(tmp_path / 'file_like.png', 'wb') as _file:
             _file.write(data)