chore: codebase cleanup — dead code, tech debt, and modernization

- Replace isinstance(x, ''.__class__) with isinstance(x, str) (6 locations)
- Remove commented-out dead code (Blocklist IP methods, conftest
  monkeypatch, test_transfer disabled test + debug prints,
  test_simulate_big_transfer, path_combo_chooser)
- Remove debug print artifacts (test_webserver, test_transfer)
- Add logging to silent except-pass blocks (Stats, Blocklist, console
  plugin, gtk3 preferences)
- Replace deprecated RPC method implementations with NotImplementedError
- Remove vestigial pyasn1 dependency and redundant mock test dep
- Fix plugin scaffold: remove unicode_literals and coding header injection
- Replace Label dead test.py script with cleanup notice
- Fix mock import fallback in test_torrent (unittest.mock is stdlib)
- Migrate distutils imports to setuptools in setup.py (Python 3.12+)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: flound1129

deluge/conftest.py

@@ -70,9 +70,6 @@ def config_dir(tmp_path):
 
 @pytest_twisted.async_yield_fixture
 async def client(request, config_dir, monkeypatch, listen_port):
-    # monkeypatch.setattr(
-    #     _client, 'connect', functools.partial(_client.connect, port=listen_port)
-    # )
     username, password = get_localhost_auth()
     if not (username and password):
         raise ValueError('No localhost username or password found')

deluge/core/core.py

@@ -39,7 +39,7 @@
 from deluge.core.preferencesmanager import PreferencesManager
 from deluge.core.rpcserver import export
 from deluge.core.torrentmanager import TorrentManager
-from deluge.decorators import deprecated, maybe_coroutine
+from deluge.decorators import maybe_coroutine
 from deluge.error import (
     AddTorrentError,
     DelugeError,
@@ -971,77 +971,53 @@ def set_torrent_trackers(
     def get_magnet_uri(self, torrent_id: str) -> str:
         return self.torrentmanager[torrent_id].get_magnet_uri()
 
-    @deprecated
     @export
     def set_torrent_max_connections(self, torrent_id, value):
-        """Deprecated: Use set_torrent_options with 'max_connections'"""
-        self.set_torrent_options([torrent_id], {'max_connections': value})
+        raise NotImplementedError('Use set_torrent_options')
 
-    @deprecated
     @export
     def set_torrent_max_upload_slots(self, torrent_id, value):
-        """Deprecated: Use set_torrent_options with 'max_upload_slots'"""
-        self.set_torrent_options([torrent_id], {'max_upload_slots': value})
+        raise NotImplementedError('Use set_torrent_options')
 
-    @deprecated
     @export
     def set_torrent_max_upload_speed(self, torrent_id, value):
-        """Deprecated: Use set_torrent_options with 'max_upload_speed'"""
-        self.set_torrent_options([torrent_id], {'max_upload_speed': value})
+        raise NotImplementedError('Use set_torrent_options')
 
-    @deprecated
     @export
     def set_torrent_max_download_speed(self, torrent_id, value):
-        """Deprecated: Use set_torrent_options with 'max_download_speed'"""
-        self.set_torrent_options([torrent_id], {'max_download_speed': value})
+        raise NotImplementedError('Use set_torrent_options')
 
-    @deprecated
     @export
     def set_torrent_file_priorities(self, torrent_id, priorities):
-        """Deprecated: Use set_torrent_options with 'file_priorities'"""
-        self.set_torrent_options([torrent_id], {'file_priorities': priorities})
+        raise NotImplementedError('Use set_torrent_options')
 
-    @deprecated
     @export
     def set_torrent_prioritize_first_last(self, torrent_id, value):
-        """Deprecated: Use set_torrent_options with 'prioritize_first_last'"""
-        self.set_torrent_options([torrent_id], {'prioritize_first_last_pieces': value})
+        raise NotImplementedError('Use set_torrent_options')
 
-    @deprecated
     @export
     def set_torrent_auto_managed(self, torrent_id, value):
-        """Deprecated: Use set_torrent_options with 'auto_managed'"""
-        self.set_torrent_options([torrent_id], {'auto_managed': value})
+        raise NotImplementedError('Use set_torrent_options')
 
-    @deprecated
     @export
     def set_torrent_stop_at_ratio(self, torrent_id, value):
-        """Deprecated: Use set_torrent_options with 'stop_at_ratio'"""
-        self.set_torrent_options([torrent_id], {'stop_at_ratio': value})
+        raise NotImplementedError('Use set_torrent_options')
 
-    @deprecated
     @export
     def set_torrent_stop_ratio(self, torrent_id, value):
-        """Deprecated: Use set_torrent_options with 'stop_ratio'"""
-        self.set_torrent_options([torrent_id], {'stop_ratio': value})
+        raise NotImplementedError('Use set_torrent_options')
 
-    @deprecated
     @export
     def set_torrent_remove_at_ratio(self, torrent_id, value):
-        """Deprecated: Use set_torrent_options with 'remove_at_ratio'"""
-        self.set_torrent_options([torrent_id], {'remove_at_ratio': value})
+        raise NotImplementedError('Use set_torrent_options')
 
-    @deprecated
     @export
     def set_torrent_move_completed(self, torrent_id, value):
-        """Deprecated: Use set_torrent_options with 'move_completed'"""
-        self.set_torrent_options([torrent_id], {'move_completed': value})
+        raise NotImplementedError('Use set_torrent_options')
 
-    @deprecated
     @export
     def set_torrent_move_completed_path(self, torrent_id, value):
-        """Deprecated: Use set_torrent_options with 'move_completed_path'"""
-        self.set_torrent_options([torrent_id], {'move_completed_path': value})
+        raise NotImplementedError('Use set_torrent_options')
 
     @export
     def get_path_size(self, path):

deluge/plugins/Blocklist/deluge_blocklist/common.py

@@ -117,50 +117,18 @@ def parse(cls, ip):
     def quadrants(self):
         return (self.q1, self.q2, self.q3, self.q4)
 
-    #    def next_ip(self):
-    #        (q1, q2, q3, q4) = self.quadrants()
-    #        if q4 >= 255:
-    #            if q3 >= 255:
-    #                if q2 >= 255:
-    #                    if q1 >= 255:
-    #                        raise BadIP(_('There is not a next IP address'))
-    #                    q1 += 1
-    #                else:
-    #                    q2 += 1
-    #            else:
-    #                q3 += 1
-    #        else:
-    #            q4 += 1
-    #        return IP(q1, q2, q3, q4)
-    #
-    #    def previous_ip(self):
-    #        (q1, q2, q3, q4) = self.quadrants()
-    #        if q4 <= 1:
-    #            if q3 <= 1:
-    #                if q2 <= 1:
-    #                    if q1 <= 1:
-    #                        raise BadIP(_('There is not a previous IP address'))
-    #                    q1 -= 1
-    #                else:
-    #                    q2 -= 1
-    #            else:
-    #                q3 -= 1
-    #        else:
-    #            q4 -= 1
-    #        return IP(q1, q2, q3, q4)
-
     def __lt__(self, other):
-        if isinstance(other, ''.__class__):
+        if isinstance(other, str):
             other = IP.parse(other)
         return self.long < other.long
 
     def __gt__(self, other):
-        if isinstance(other, ''.__class__):
+        if isinstance(other, str):
             other = IP.parse(other)
         return self.long > other.long
 
     def __eq__(self, other):
-        if isinstance(other, ''.__class__):
+        if isinstance(other, str):
             other = IP.parse(other)
         return self.long == other.long
 

deluge/plugins/Blocklist/deluge_blocklist/readers.py

@@ -63,6 +63,7 @@ def is_valid(self):
                     ):
                         valid = False
                 except Exception:
+                    log.debug('Failed to parse blocklist line for validation')
                     valid = False
                 break
         blocklist.close()

deluge/plugins/Label/deluge_label/test.py

@@ -1,47 +1,3 @@
-#!/usr/bin/env python
-#
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2008 Martijn Voncken <mvoncken@gmail.com>
-#
-# 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.
-#
-
-from deluge.ui.client import sclient
-
-sclient.set_core_uri()
-
-print(sclient.get_enabled_plugins())
-
-# enable plugin.
-if 'label' not in sclient.get_enabled_plugins():
-    sclient.enable_plugin('label')
-
-
-# test labels.
-print('#init labels')
-try:
-    sclient.label_remove('test')
-except Exception:
-    pass
-sess_id = sclient.get_session_state()[0]
-
-print('#add')
-sclient.label_add('test')
-print('#set')
-sclient.label_set_torrent(id, 'test')
-
-print(sclient.get_torrents_status({'label': 'test'}, 'name'))
-
-
-print('#set options')
-sclient.label_set_options('test', {'max_download_speed': 999}, True)
-print(sclient.get_torrent_status(sess_id, ['max_download_speed']), '999')
-sclient.label_set_options('test', {'max_download_speed': 9}, True)
-print(sclient.get_torrent_status(sess_id, ['max_download_speed']), '9')
-sclient.label_set_options('test', {'max_download_speed': 888}, False)
-print(sclient.get_torrent_status(sess_id, ['max_download_speed']), '9 (888)')
-
-print(sclient.get_torrent_status(sess_id, ['name', 'tracker_host', 'label']))
+# This file previously contained a manual test script using the deprecated
+# synchronous client. It has been removed as part of codebase cleanup.
+# Plugin tests should use pytest fixtures in deluge/tests/.

deluge/plugins/Notifications/deluge_notifications/gtkui.py

@@ -152,7 +152,7 @@ def handle_custom_blink_notification(self, result, eventtype):
         )
 
     def handle_custom_sound_notification(self, result, eventtype):
-        if isinstance(result, ''.__class__):
+        if isinstance(result, str):
             if not result and eventtype in self.config['custom_sounds']:
                 return defer.maybeDeferred(
                     self.__play_sound, self.config['custom_sounds'][eventtype]

deluge/plugins/Stats/deluge_stats/core.py

@@ -46,6 +46,7 @@ def mean(items):
     try:
         return sum(items) // len(items)
     except Exception:
+        log.debug('Failed to calculate mean, returning 0')
         return 0
 
 

deluge/plugins/Stats/deluge_stats/gtkui.py

@@ -206,6 +206,7 @@ def _on_intervals_changed(self, intervals):
         try:
             current = intervals.index(self.selected_interval)
         except Exception:
+            log.debug('Selected interval not found in intervals list, defaulting to 0')
             current = 0
         # should select the value saved in config
         self.intervals_combo.set_active(current)
@@ -276,6 +277,7 @@ def on_apply_prefs(self):
                 try:
                     gtkconf[graph][value] = color_btn.get_color().to_string()
                 except Exception:
+                    log.debug('Failed to get color for %s %s, using default', graph, value)
                     gtkconf[graph][value] = DEFAULT_CONF['colors'][graph][value]
         self.config['colors'] = gtkconf
         self.graphs_tab.set_colors(self.config['colors'])

deluge/scripts/create_plugin.py

@@ -122,8 +122,7 @@ def write_file(path, filename, template, include_gpl=True):
     os.system(dev_link_path)
 
 
-CORE = """from __future__ import unicode_literals
-
+CORE = """
 import logging
 
 import deluge.configmanager
@@ -222,8 +221,7 @@ def __init__(self, plugin_name):
 )
 """
 
-COMMON = """from __future__ import unicode_literals
-
+COMMON = """
 import os.path
 
 from pkg_resources import resource_filename
@@ -233,8 +231,7 @@ def get_resource(filename):
     return resource_filename(__package__, os.path.join('data', filename))
 """
 
-GTK3UI = """from __future__ import unicode_literals
-
+GTK3UI = """
 import logging
 
 from gi.repository import Gtk
@@ -311,8 +308,7 @@ def cb_get_config(self, config):
 </interface>
 """
 
-WEBUI = """from __future__ import unicode_literals
-
+WEBUI = """
 import logging
 
 from deluge.plugins.pluginbase import WebPluginBase
@@ -365,8 +361,7 @@ def disable(self):
 new %(name)sPlugin();
 """
 
-GPL = """# -*- coding: utf-8 -*-
-# Copyright (C) %(current_year)d %(author_name)s <%(author_email)s>
+GPL = """# Copyright (C) %(current_year)d %(author_name)s <%(author_email)s>
 #
 # Basic plugin template created by the Deluge Team.
 #

deluge/tests/__init__.py

@@ -11,7 +11,6 @@
         resource.setrlimit(resource.RLIMIT_NOFILE, (65536, 65536))
     except (ValueError, resource.error) as ex:
         error = 'Failed to raise file descriptor limit: %s' % ex
-        # print(error)
 
 # Initialize gettext
 setup_translation()