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

[Lint] Fix flake8 3.7 warnings

Browse source 
- Fix new flake8 warnings from latest version.
  Note: The `addSlash` variable was orphaned with no reference in
        Twisted or Deluge code so removed.

- Update pre-commit config
  - New pinned versions.
  - Fix prettier output.
  - Use new flake8 hook config and add naming plugin.
This commit is contained in:
Calum Lind 2019-03-29 10:57:22 +00:00
parent 02e07dda2a
commit c8b621172e
14 changed files with 41 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.pre-commit-config.yaml
View file

@ -10,12 +10,22 @@ repos:
name: Fmt Black
language_version: python3.6
- repo: https://github.com/prettier/prettier
rev: 1.15.2
rev: 1.16.4
hooks:
- id: prettier
name: Fmt Prettier
# Workaround to list modified files only.
args: [--list-different]
- repo: https://gitlab.com/pycqa/flake8
rev: 3.7.7
hooks:
- id: flake8
name: Chk Flake8
additional_dependencies:
- flake8-isort==2.7
- pep8-naming==0.8.2
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v1.4.0
rev: v2.1.0
hooks:
- id: double-quote-string-fixer
name: Fix Double-quotes
@ -27,7 +37,3 @@ repos:
args: [--fix=auto]
- id: trailing-whitespace
name: Fix Trailing whitespace
- id: flake8
name: Chk Flake8
additional_dependencies:
- flake8-isort==2.5

4
deluge/config.py
View file

@ -49,12 +49,12 @@ from codecs import getwriter
from io import open
from tempfile import NamedTemporaryFile
import six.moves.cPickle as pickle
import six.moves.cPickle as pickle # noqa: N813
from deluge.common import JSON_FORMAT, get_default_config_dir
log = logging.getLogger(__name__)
callLater = None # Necessary for the config tests
callLater = None # noqa: N816 Necessary for the config tests
def prop(func):

4
deluge/core/torrentmanager.py
View file

@ -17,7 +17,7 @@ import os
import time
from tempfile import gettempdir
import six.moves.cPickle as pickle
import six.moves.cPickle as pickle # noqa: N813
from twisted.internet import defer, error, reactor, threads
from twisted.internet.defer import Deferred, DeferredList
from twisted.internet.task import LoopingCall
@ -128,7 +128,7 @@ class TorrentManager(component.Component):
"""
callLater = reactor.callLater
callLater = reactor.callLater # noqa: N815
def __init__(self):
component.Component.__init__(

4
deluge/plugins/Label/deluge/plugins/label/gtkui/submenu.py
View file

@ -31,7 +31,7 @@ del _
class LabelMenu(MenuItem):
def __init__(self):
MenuItem.__init__(self, _('Label'))
MenuItem.__init__(self, _('Label')) # noqa: F821
self.sub_menu = Menu()
self.set_submenu(self.sub_menu)
@ -52,7 +52,7 @@ class LabelMenu(MenuItem):
self.sub_menu.remove(child)
for label in [NO_LABEL] + list(labels):
if label == NO_LABEL:
item = MenuItem(_(NO_LABEL))
item = MenuItem(_(NO_LABEL)) # noqa: F821
else:
item = MenuItem(label.replace('_', '__'))
item.connect('activate', self.on_select_label, label)

3
deluge/tests/test_core.py
View file

@ -68,9 +68,6 @@ class RedirectResource(Resource):
class TopLevelResource(Resource):
addSlash = True
def __init__(self):
Resource.__init__(self)
self.putChild(b'cookie', CookieResource())

3
deluge/tests/test_httpdownloader.py
View file

@ -91,9 +91,6 @@ class PartialDownloadResource(Resource):
class TopLevelResource(Resource):
addSlash = True
def __init__(self):
Resource.__init__(self)
self.putChild(b'cookie', CookieResource())

4
deluge/tests/twisted/plugins/delugereporter.py
View file

@ -19,8 +19,8 @@ from zope.interface import implements
class _Reporter(object):
implements(IPlugin, IReporter)
def __init__( # NOQA: N803
self, name, module, description, longOpt, shortOpt, klass
def __init__(
self, name, module, description, longOpt, shortOpt, klass # noqa: N803
):
self.name = name
self.module = module

2
deluge/ui/gtk3/common.py
View file

@ -15,7 +15,7 @@ import os
import shutil
import sys
import six.moves.cPickle as pickle
import six.moves.cPickle as pickle # noqa: N813
from gi.repository.Gdk import SELECTION_CLIPBOARD
from gi.repository.GdkPixbuf import Colorspace, Pixbuf
from gi.repository.GLib import GError

2
deluge/ui/gtk3/files_tab.py
View file

@ -12,7 +12,7 @@ from __future__ import division, unicode_literals
import logging
import os.path
import six.moves.cPickle as pickle
import six.moves.cPickle as pickle # noqa: N813
from gi.repository import Gio, Gtk
from gi.repository.Gdk import DragAction, ModifierType, keyval_name
from gi.repository.GObject import TYPE_UINT64

2
deluge/ui/gtk3/path_chooser.py
View file

@ -90,7 +90,7 @@ class PathChoosersHandler(component.Component):
chooser.config_key_funcs[key][1](value)
# Save to core
if key is not 'path_chooser_max_popup_rows':
if key != 'path_chooser_max_popup_rows':
client.core.set_config({key: value})
else:
# Since the max rows value can be changed fast with a spinbutton, we

2
deluge/ui/gtk3/path_combo_chooser.py
View file

@ -1237,7 +1237,7 @@ class PathChooserComboBox(Gtk.Box, StoredValuesPopup, GObject.GObject):
folder_name = ''
if self.show_folder_name_on_button or not self.path_entry_visible:
folder_name = path_without_trailing_path_sep(text)
if folder_name is not '/' and os.path.basename(folder_name):
if folder_name != '/' and os.path.basename(folder_name):
folder_name = os.path.basename(folder_name)
self.folder_name_label.set_text(folder_name)
# Only trigger event if text has changed

29
deluge/ui/web/js/deluge-all/ConnectionManager.js
View file

@ -267,22 +267,19 @@ Deluge.ConnectionManager = Ext.extend(Ext.Window, {
}
var id = selected.id;
deluge.client.web.connect(
id,
{
success: function(methods) {
deluge.client.reloadMethods();
deluge.client.on(
'connected',
function(e) {
deluge.events.fire('connect');
},
this,
{ single: true }
);
},
}
);
deluge.client.web.connect(id, {
success: function(methods) {
deluge.client.reloadMethods();
deluge.client.on(
'connected',
function(e) {
deluge.events.fire('connect');
},
this,
{ single: true }
);
},
});
this.hide();
}
},

1
deluge/ui/web/server.py
View file

@ -438,7 +438,6 @@ class ScriptResource(resource.Resource, component.Component):
class TopLevel(resource.Resource):
addSlash = True
__stylesheets = [
'css/ext-all-notheme.css',

8
packaging/win32/deluge-bbfreeze.py
View file

@ -154,7 +154,7 @@ for script in script_list:
os.remove(script)
# Exclude files which are already included in GTK or Windows. Also exclude unneeded pygame dlls.
excludeDlls = (
exclude_dlls = (
'MSIMG32.dll',
'MSVCR90.dll',
'MSVCP90.dll',
@ -170,7 +170,7 @@ excludeDlls = (
'SDL_image.dll',
'SDL_ttf.dll',
)
for exclude_dll in excludeDlls:
for exclude_dll in exclude_dlls:
try:
os.remove(os.path.join(build_dir, exclude_dll))
except OSError:
@ -224,14 +224,14 @@ for script in script_list:
script_exe = os.path.splitext(os.path.basename(script))[0] + '.exe'
# Don't add to dev build versions.
if not re.search('[a-zA-Z_-]', build_version):
versionInfo = VersionInfo(
version_info = VersionInfo(
build_version,
description='Deluge Bittorrent Client',
company='Deluge Team',
product='Deluge',
_copyright='Deluge Team',
)
stamp(os.path.join(build_dir, script_exe), versionInfo)
stamp(os.path.join(build_dir, script_exe), version_info)
# Copy version info to file for nsis script.
with open('VERSION.tmp', 'w') as ver_file: