[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     d91eae898ccf827917d9fea1fcc01f49e91a7602
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jun  4 18:48:11 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 23:03:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d91eae89

net-p2p/deluge: remove unused patches

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25753
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch | 143 ---------------------
 net-p2p/deluge/files/deluge-2.0.3-gettext.patch    |  11 --
 net-p2p/deluge/files/deluge-2.0.3-log.patch        |  13 --
 3 files changed, 167 deletions(-)

diff --git a/net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch b/net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch
deleted file mode 100644
index 446ae2e9a0e1..000000000000
--- a/net-p2p/deluge/files/deluge-2.0.3-fix-pickle.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-https://dev.deluge-torrent.org/changeset/23b3f144fce3424ae
-
-Index: deluge/core/torrentmanager.py
-===================================================================
---- deluge-2.0.3/deluge/core/torrentmanager.py	(revision 8b62e50eb8bf81a177c4d62484a44b766c6f54a6)
-+++ deluge-2.0.3/deluge/core/torrentmanager.py	(revision 23b3f144fce3424ae874d54a659cb7b8dd624ade)
-@@ -26,5 +26,5 @@
- import deluge.component as component
- from deluge._libtorrent import lt
--from deluge.common import archive_files, decode_bytes, get_magnet_info, is_magnet
-+from deluge.common import PY2, archive_files, decode_bytes, get_magnet_info, is_magnet
- from deluge.configmanager import ConfigManager, get_config_dir
- from deluge.core.authmanager import AUTH_LEVEL_ADMIN
-@@ -810,5 +810,8 @@
-             try:
-                 with open(filepath, 'rb') as _file:
--                    state = pickle.load(_file)
-+                    if PY2:
-+                        state = pickle.load(_file)
-+                    else:
-+                        state = pickle.load(_file, encoding='utf8')
-             except (IOError, EOFError, pickle.UnpicklingError) as ex:
-                 message = 'Unable to load {}: {}'.format(filepath, ex)
-Index: deluge/tests/data/utf8_filename_torrents.state
-===================================================================
---- deluge-2.0.3/deluge/tests/data/utf8_filename_torrents.state	(revision 23b3f144fce3424ae874d54a659cb7b8dd624ade)
-+++ deluge-2.0.3/deluge/tests/data/utf8_filename_torrents.state	(revision 23b3f144fce3424ae874d54a659cb7b8dd624ade)
-@@ -0,0 +1,85 @@
-+(ideluge.core.torrentmanager
-+TorrentManagerState
-+p1
-+(dp2
-+S'torrents'
-+p3
-+(lp4
-+(ideluge.core.torrentmanager
-+TorrentState
-+p5
-+(dp6
-+S'max_download_speed'
-+p7
-+I-1
-+sS'move_completed_path'
-+p8
-+S'/home/calum/Downloads'
-+p9
-+sS'paused'
-+p10
-+I00
-+sS'max_upload_slots'
-+p11
-+I-1
-+sS'prioritize_first_last'
-+p12
-+I00
-+sS'max_connections'
-+p13
-+I-1
-+sS'compact'
-+p14
-+I00
-+sS'queue'
-+p15
-+I0
-+sS'file_priorities'
-+p16
-+(lp17
-+I4
-+asS'filename'
-+p18
-+S'\xc2\xa2.torrent'
-+p19
-+sS'max_upload_speed'
-+p20
-+I-1
-+sS'save_path'
-+p21
-+S'/home/calum/Downloads'
-+p22
-+sS'time_added'
-+p23
-+F1573563097.749759
-+sS'total_uploaded'
-+p24
-+I0
-+sS'torrent_id'
-+p25
-+S'80d81d55ef3b85f3c1b634c362e014b35594dc71'
-+p26
-+sS'auto_managed'
-+p27
-+I01
-+sS'stop_at_ratio'
-+p28
-+I00
-+sS'move_completed'
-+p29
-+I00
-+sS'trackers'
-+p30
-+(lp31
-+sS'magnet'
-+p32
-+NsS'remove_at_ratio'
-+p33
-+I00
-+sS'stop_ratio'
-+p34
-+F2
-+sS'is_finished'
-+p35
-+I00
-+sbasb.
-Index: deluge/tests/test_torrentmanager.py
-===================================================================
---- deluge-2.0.3/deluge/tests/test_torrentmanager.py	(revision c6b6902e9f3e37f5b15184eb509b48b43817a331)
-+++ deluge-2.0.3/deluge/tests/test_torrentmanager.py	(revision 23b3f144fce3424ae874d54a659cb7b8dd624ade)
-@@ -8,4 +8,6 @@
- from __future__ import unicode_literals
- 
-+import os
-+import shutil
- import warnings
- from base64 import b64encode
-@@ -29,5 +31,5 @@
- class TorrentmanagerTestCase(BaseTestCase):
-     def set_up(self):
--        common.set_tmp_config_dir()
-+        self.config_dir = common.set_tmp_config_dir()
-         self.rpcserver = RPCServer(listen=False)
-         self.core = Core()
-@@ -119,2 +121,11 @@
-             InvalidTorrentError, self.tm.remove, 'torrentidthatdoesntexist'
-         )
-+
-+    def test_open_state_from_python2(self):
-+        """Open a Python2 state with a UTF-8 encoded torrent filename."""
-+        shutil.copy(
-+            common.get_test_data_file('utf8_filename_torrents.state'),
-+            os.path.join(self.config_dir, 'state', 'torrents.state'),
-+        )
-+        state = self.tm.open_state()
-+        self.assertEqual(len(state.torrents), 1)

diff --git a/net-p2p/deluge/files/deluge-2.0.3-gettext.patch b/net-p2p/deluge/files/deluge-2.0.3-gettext.patch
deleted file mode 100644
index 41cf743749c6..000000000000
--- a/net-p2p/deluge/files/deluge-2.0.3-gettext.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/deluge/i18n/util.py
-+++ b/deluge/i18n/util.py
-@@ -114,7 +114,7 @@
-         # Workaround for Python 2 unicode gettext (keyword removed in Py3).
-         kwargs = {} if not deluge.common.PY2 else {'unicode': True}
- 
--        gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs)
-+        gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs)
-         builtins.__dict__['_n'] = builtins.__dict__['ngettext']
- 
-         libintl = None

diff --git a/net-p2p/deluge/files/deluge-2.0.3-log.patch b/net-p2p/deluge/files/deluge-2.0.3-log.patch
deleted file mode 100644
index 45dd9896a915..000000000000
--- a/net-p2p/deluge/files/deluge-2.0.3-log.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://dev.deluge-torrent.org/changeset/351664ec071daa04
-https://dev.deluge-torrent.org/ticket/3327
-Index: deluge/log.py
-===================================================================
---- a/deluge/log.py
-+++ b/deluge/log.py
-@@ -87,5 +87,5 @@
-         yield LoggingLoggerClass.exception(self, msg, *args, **kwargs)
- 
--    def findCaller(self, stack_info=False):  # NOQA: N802
-+    def findCaller(self, *args, **kwargs):  # NOQA: N802
-         f = logging.currentframe().f_back
-         rv = '(unknown file)', 0, '(unknown function)'