mirrors/deluge
1
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-04-03 19:07:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

[Lint] Fix ruff lint gettext and type comparison

Browse source 
The gettext strings cannot be formatted until after the function return
from gettext.

Refs: https://docs.astral.sh/ruff/rules/f-string-in-get-text-func-call/
Refs: https://docs.astral.sh/ruff/rules/printf-in-get-text-func-call/
This commit is contained in:
Calum Lind 2024-09-08 13:24:44 +01:00
parent e7d08d7645
commit 2247668571
No known key found for this signature in database
GPG key ID: 90597A687B836BA3
10 changed files with 37 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
deluge/plugins/Blocklist/deluge_blocklist/common.py
View file

@ -107,11 +107,11 @@ class IP:
try:
q1, q2, q3, q4 = (int(q) for q in ip.split('.'))
except ValueError:
raise BadIP(_('The IP address "%s" is badly formed' % ip))
raise BadIP(_('The IP address "%s" is badly formed') % ip)
if q1 < 0 or q2 < 0 or q3 < 0 or q4 < 0:
raise BadIP(_('The IP address "%s" is badly formed' % ip))
raise BadIP(_('The IP address "%s" is badly formed') % ip)
elif q1 > 255 or q2 > 255 or q3 > 255 or q4 > 255:
raise BadIP(_('The IP address "%s" is badly formed' % ip))
raise BadIP(_('The IP address "%s" is badly formed') % ip)
return cls(q1, q2, q3, q4)
def quadrants(self):

2
deluge/tests/test_json_api.py
View file

@ -33,7 +33,7 @@ class TestJSON:
async def test_get_remote_methods(self):
json = JSON()
methods = await json.get_remote_methods()
assert type(methods) == tuple
assert isinstance(methods, tuple)
assert len(methods) > 0
def test_render_fail_disconnected(self):

2
deluge/tests/test_log.py
View file

@ -28,7 +28,7 @@ class TestLog(BaseTestCase):
# Cause all warnings to always be triggered.
warnings.simplefilter('always')
LOG.debug('foo')
assert w[-1].category == DeprecationWarning
assert w[-1].category is DeprecationWarning
# def test_twisted_error_log(self):
# from twisted.internet import defer

2
deluge/tests/test_ui_entry.py
View file

@ -330,7 +330,7 @@ class ConsoleUIWithDaemonBaseTestCase(UIWithDaemonBaseTestCase):
return UIWithDaemonBaseTestCase.set_up(self)
def patch_arg_command(self, command):
if type(command) == str:
if isinstance(command, str):
command = [command]
username, password = get_localhost_auth()
self.patch(

2
deluge/tests/test_web_api.py
View file

@ -34,7 +34,7 @@ class TestWebAPI(WebServerTestBase):
d = self.deluge_web.web_api.connect(self.host_id)
def on_connect(result):
assert type(result) == tuple
assert isinstance(result, tuple)
assert len(result) > 0
return result

2
deluge/ui/console/cmdline/command.py
View file

@ -201,7 +201,7 @@ class BaseCommand:
for cmd_name in sorted([self.name] + self.aliases):
if cmd_name not in subparsers._name_parser_map:
if cmd_name in self.aliases:
opts['help'] = _('`%s` alias' % self.name)
opts['help'] = _('`%s` alias') % self.name
parser = subparsers.add_parser(cmd_name, **opts)
break

2
deluge/ui/console/cmdline/commands/info.py
View file

@ -111,7 +111,7 @@ class Command(BaseCommand):
'--state',
action='store',
dest='state',
help=_('Show torrents with state STATE: %s.' % (', '.join(STATES))),
help=_('Show torrents with state STATE: %s.') % (', '.join(STATES)),
)
parser.add_argument(
'--sort',

11
deluge/ui/gtk3/addtorrentdialog.py
View file

@ -236,8 +236,9 @@ class AddTorrentDialog(component.Component):
_('Duplicate torrent(s)'),
_(
'You cannot add the same torrent twice.'
' %d torrents were already added.' % count
),
' %d torrents were already added.'
)
% count,
self.dialog,
).run()
@ -585,9 +586,9 @@ class AddTorrentDialog(component.Component):
self.files_treestore.iter_children(_iter), priorities
)
elif not self.files_treestore.get_value(_iter, 1).endswith('/'):
priorities[
self.files_treestore.get_value(_iter, 3)
] = self.files_treestore.get_value(_iter, 0)
priorities[self.files_treestore.get_value(_iter, 3)] = (
self.files_treestore.get_value(_iter, 0)
)
_iter = self.files_treestore.iter_next(_iter)
return priorities

3
deluge/ui/gtk3/gtkui.py
View file

@ -324,8 +324,7 @@ class GtkUI:
err_msg = _(
'Only Thin Client mode is available due to libtorrent import error: %s\n'
'To use Standalone mode, please see logs for error details.'
% (str(ex))
)
) % (str(ex))
except ImportError as ex:
log.exception(ex)

40
deluge/ui/gtk3/preferences.py
View file

@ -226,20 +226,20 @@ class Preferences(component.Component):
self.language_checkbox = self.builder.get_object('checkbutton_language')
lang_model = self.language_combo.get_model()
langs = get_languages()
index = -1
for i, l in enumerate(langs):
lang_code, name = l
lang_idx = -1
for idx, lang in enumerate(langs):
lang_code, name = lang
lang_model.append([lang_code, name])
if self.gtkui_config['language'] == lang_code:
index = i
lang_idx = idx
if self.gtkui_config['language'] is None:
self.language_checkbox.set_active(True)
self.language_combo.set_visible(False)
else:
self.language_combo.set_visible(True)
if index != -1:
self.language_combo.set_active(index)
if lang_idx != -1:
self.language_combo.set_active(lang_idx)
def __del__(self):
del self.gtkui_config
@ -647,15 +647,15 @@ class Preferences(component.Component):
'chk_move_completed'
).get_active()
new_core_config[
'download_location'
] = self.download_location_path_chooser.get_text()
new_core_config[
'move_completed_path'
] = self.move_completed_path_chooser.get_text()
new_core_config[
'torrentfiles_location'
] = self.copy_torrent_files_path_chooser.get_text()
new_core_config['download_location'] = (
self.download_location_path_chooser.get_text()
)
new_core_config['move_completed_path'] = (
self.move_completed_path_chooser.get_text()
)
new_core_config['torrentfiles_location'] = (
self.copy_torrent_files_path_chooser.get_text()
)
new_core_config['prioritize_first_last_pieces'] = self.builder.get_object(
'chk_prioritize_first_last_pieces'
).get_active()
@ -956,7 +956,7 @@ class Preferences(component.Component):
mode = _('Thinclient') if was_standalone else _('Standalone')
dialog = YesNoDialog(
_('Switching Deluge Client Mode...'),
_('Do you want to restart to use %s mode?' % mode),
_('Do you want to restart to use %s mode?') % mode,
)
dialog.run().addCallback(on_response)
@ -1381,7 +1381,9 @@ class Preferences(component.Component):
except Exception as ex:
return ErrorDialog(
_('Error Adding Account'),
_(f'An error occurred while adding account: {account}'),
_('An error occurred while adding account: {account}').format(
account=account
),
parent=self.pref_dialog,
details=ex,
).run()
@ -1434,8 +1436,8 @@ class Preferences(component.Component):
header = _('Remove Account')
text = _(
'Are you sure you want to remove the account with the '
'username "%(username)s"?' % {'username': username}
)
'username "%(username)s"?'
) % {'username': username}
dialog = YesNoDialog(header, text, parent=self.pref_dialog)
def dialog_finished(response_id):