Skip to content

Commit

Permalink
[Lint] Enable pylint 'bad-continuation' and fix issues
Browse files Browse the repository at this point in the history
There is some discrepency between pep8 and pylint for line
continuation (pylint-dev/pylint#747) but
with some minor layout changes both can pass and code looks fine,
if not better in places.
  • Loading branch information
cas-- committed May 9, 2016
1 parent 807d7a7 commit 618d2f9
Show file tree
Hide file tree
Showing 17 changed files with 89 additions and 94 deletions.
3 changes: 1 addition & 2 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ confidence=
#
# Arranged by category: Convention, Error, Information, Refactor, Warning.
# Category per line (wrapped categories are indented) using symbolic names instead of ids.
disable=missing-docstring, invalid-name, bad-continuation, wrong-import-position,
wrong-import-order,
disable=missing-docstring, invalid-name, wrong-import-position, wrong-import-order,
no-member, not-callable, no-name-in-module,
locally-disabled,
R,
Expand Down
6 changes: 3 additions & 3 deletions deluge/core/torrent.py
Original file line number Diff line number Diff line change
Expand Up @@ -1009,8 +1009,8 @@ def _create_status_funcs(self):
"save_path": lambda: self.options["download_location"], # Deprecated, use download_location
"download_location": lambda: self.options["download_location"],
"seeding_time": lambda: self.status.seeding_time,
"seeds_peers_ratio": lambda: -1.0 if self.status.num_incomplete == 0 else
self.status.num_complete / self.status.num_incomplete, # Use -1.0 to signify infinity
"seeds_peers_ratio": lambda: -1.0 if self.status.num_incomplete == 0 else ( # Use -1.0 to signify infinity
self.status.num_complete / self.status.num_incomplete),
"seed_rank": lambda: self.status.seed_rank,
"state": lambda: self.state,
"stop_at_ratio": lambda: self.options["stop_at_ratio"],
Expand Down Expand Up @@ -1087,7 +1087,7 @@ def resume(self):
elif self.forced_error and self.forced_error.was_paused:
log.debug("Resume skipped for error'd torrent as it was originally paused.")
elif (self.status.is_finished and self.options["stop_at_ratio"] and
self.get_ratio() >= self.options["stop_ratio"]):
self.get_ratio() >= self.options["stop_ratio"]):
log.debug("Resume skipped for torrent as it has reached 'stop_seed_ratio'.")
else:
# Check if torrent was originally being auto-managed.
Expand Down
3 changes: 1 addition & 2 deletions deluge/core/torrentmanager.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@ def __init__(self,
shared=False,
super_seeding=False,
priority=0,
name=None
):
name=None):
# Build the class atrribute list from args
for key, value in locals().items():
if key == "self":
Expand Down
30 changes: 16 additions & 14 deletions deluge/plugins/Stats/deluge/plugins/stats/gtkui.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,22 @@

log = logging.getLogger(__name__)

DEFAULT_CONF = {'version': 1,
'colors': {
'bandwidth_graph': {'upload_rate': str(gtk.gdk.Color("blue")),
'download_rate': str(gtk.gdk.Color("green")),
},
'connections_graph': {'dht_nodes': str(gtk.gdk.Color("orange")),
'dht_cache_nodes': str(gtk.gdk.Color("blue")),
'dht_torrents': str(gtk.gdk.Color("green")),
'num_connections': str(gtk.gdk.Color("darkred")),
},
'seeds_graph': {'num_peers': str(gtk.gdk.Color("blue")),
},
}
}
DEFAULT_CONF = {
'version': 1,
'colors': {
'bandwidth_graph': {
'upload_rate': str(gtk.gdk.Color("blue")),
'download_rate': str(gtk.gdk.Color("green")),
},
'connections_graph': {
'dht_nodes': str(gtk.gdk.Color("orange")),
'dht_cache_nodes': str(gtk.gdk.Color("blue")),
'dht_torrents': str(gtk.gdk.Color("green")),
'num_connections': str(gtk.gdk.Color("darkred")),
},
'seeds_graph': {
'num_peers': str(gtk.gdk.Color("blue")),
}}}


def neat_time(column, cell, model, data):
Expand Down
10 changes: 6 additions & 4 deletions deluge/ui/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,12 +305,14 @@ def walk(directory, parent_path):
for path in directory["contents"].keys():
full_path = os.path.join(parent_path, path).replace("\\", "/")
if directory["contents"][path]["type"] == "dir":
directory["contents"][path] = callback(full_path, directory["contents"][path]
) or directory["contents"][path]
directory["contents"][path] = callback(
full_path, directory["contents"][path]
) or directory["contents"][path]
walk(directory["contents"][path], full_path)
else:
directory["contents"][path] = callback(full_path, directory["contents"][path]
) or directory["contents"][path]
directory["contents"][path] = callback(
full_path, directory["contents"][path]
) or directory["contents"][path]
walk(self.tree, "")

def __str__(self):
Expand Down
3 changes: 1 addition & 2 deletions deluge/ui/console/eventlog.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ def on_torrent_added_event(self, torrent_id, from_state):

def on_torrent_status(status):
self.write("{!green!}Torrent Added: {!info!}%s ({!cyan!}%s{!info!})" % (
status["name"], torrent_id)
)
status["name"], torrent_id))
# Write out what state the added torrent took
self.on_torrent_state_changed_event(torrent_id, status["state"])

Expand Down
4 changes: 2 additions & 2 deletions deluge/ui/console/modes/add_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,5 @@ def add_torrent(t_file, options, success_cb, fail_cb, ress):
filename = os.path.split(f)[-1]
filedump = base64.encodestring(open(f).read())

client.core.add_torrent_file(filename, filedump, t_options
).addCallback(success_cb, f, ress).addErrback(fail_cb, f, ress)
client.core.add_torrent_file(
filename, filedump, t_options).addCallback(success_cb, f, ress).addErrback(fail_cb, f, ress)
42 changes: 22 additions & 20 deletions deluge/ui/console/modes/alltorrents.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,14 @@
"addtorrents_last_path": "~"
}

column_pref_names = ["queue", "name", "size", "state", "progress", "seeds",
"peers", "downspeed", "upspeed", "eta", "ratio", "avail",
"added", "tracker", "savepath", "downloaded", "uploaded",
"remaining", "owner", "downloading_time", "seeding_time",
"completed", "seeds_peers_ratio", "complete_seen",
"down_limit", "up_limit", "shared",
]
column_pref_names = [
"queue", "name", "size", "state", "progress", "seeds",
"peers", "downspeed", "upspeed", "eta", "ratio", "avail",
"added", "tracker", "savepath", "downloaded", "uploaded",
"remaining", "owner", "downloading_time", "seeding_time",
"completed", "seeds_peers_ratio", "complete_seen",
"down_limit", "up_limit", "shared",
]

prefs_to_names = {
"queue": "#",
Expand Down Expand Up @@ -330,13 +331,14 @@ def __init__(self, stdscr, encoding=None):
("Seed Rank", str, ("seed_rank",)),
]

self.__status_keys = ["name", "state", "download_payload_rate", "upload_payload_rate",
"progress", "eta", "download_location", "all_time_download", "total_uploaded",
"ratio", "num_seeds", "total_seeds", "num_peers", "total_peers",
"active_time", "seeding_time", "last_seen_complete", "time_added",
"completed_time", "distributed_copies", "num_pieces", "piece_length",
"seed_rank"
]
self.__status_keys = [
"name", "state", "download_payload_rate", "upload_payload_rate",
"progress", "eta", "download_location", "all_time_download", "total_uploaded",
"ratio", "num_seeds", "total_seeds", "num_peers", "total_peers",
"active_time", "seeding_time", "last_seen_complete", "time_added",
"completed_time", "distributed_copies", "num_pieces", "piece_length",
"seed_rank"
]

self.legacy_mode = Legacy(self.stdscr, self.encoding)

Expand All @@ -347,15 +349,15 @@ def __init__(self, stdscr, encoding=None):

# component start/update
def start(self):
component.get("SessionProxy").get_torrents_status(self.__status_dict, self.__status_fields
).addCallback(self.set_state, False)
component.get("SessionProxy").get_torrents_status(
self.__status_dict, self.__status_fields).addCallback(self.set_state, False)

def update(self):
component.get("SessionProxy").get_torrents_status(self.__status_dict, self.__status_fields
).addCallback(self.set_state, True)
component.get("SessionProxy").get_torrents_status(
self.__status_dict, self.__status_fields).addCallback(self.set_state, True)
if self.__torrent_info_id:
component.get("SessionProxy").get_torrent_status(self.__torrent_info_id, self.__status_keys
).addCallback(self._on_torrent_status)
component.get("SessionProxy").get_torrent_status(
self.__torrent_info_id, self.__status_keys).addCallback(self._on_torrent_status)

def update_config(self):
self.config = ConfigManager("console.conf", DEFAULT_PREFS)
Expand Down
6 changes: 3 additions & 3 deletions deluge/ui/gtkui/connectionmanager.py
Original file line number Diff line number Diff line change
Expand Up @@ -324,9 +324,9 @@ def on_connect_failed(reason, host_id):
user = row[HOSTLIST_COL_USER]

if client.connected() and (
gethostbyname(host),
port,
"localclient" if not user and host in ("127.0.0.1", "localhost") else user
gethostbyname(host),
port,
"localclient" if not user and host in ("127.0.0.1", "localhost") else user
) == client.connection_info():
def on_info(info, row):
if not self.running:
Expand Down
15 changes: 5 additions & 10 deletions deluge/ui/gtkui/mainwindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,24 +80,19 @@ def patched_connect_signals(*a, **k):

# Get the gtk builder file for the main window
self.main_builder.add_from_file(deluge.common.resource_filename(
"deluge.ui.gtkui", os.path.join("glade", "main_window.ui"))
)
"deluge.ui.gtkui", os.path.join("glade", "main_window.ui")))
# The new release dialog
self.main_builder.add_from_file(deluge.common.resource_filename(
"deluge.ui.gtkui", os.path.join("glade", "main_window.new_release.ui"))
)
"deluge.ui.gtkui", os.path.join("glade", "main_window.new_release.ui")))
# The tabs
self.main_builder.add_from_file(deluge.common.resource_filename(
"deluge.ui.gtkui", os.path.join("glade", "main_window.tabs.ui"))
)
"deluge.ui.gtkui", os.path.join("glade", "main_window.tabs.ui")))
# The tabs file menu
self.main_builder.add_from_file(deluge.common.resource_filename(
"deluge.ui.gtkui", os.path.join("glade", "main_window.tabs.menu_file.ui"))
)
"deluge.ui.gtkui", os.path.join("glade", "main_window.tabs.menu_file.ui")))
# The tabs peer menu
self.main_builder.add_from_file(deluge.common.resource_filename(
"deluge.ui.gtkui", os.path.join("glade", "main_window.tabs.menu_peer.ui"))
)
"deluge.ui.gtkui", os.path.join("glade", "main_window.tabs.menu_peer.ui")))

self.window = self.main_builder.get_object("main_window")

Expand Down
4 changes: 1 addition & 3 deletions deluge/ui/gtkui/path_combo_chooser.py
Original file line number Diff line number Diff line change
Expand Up @@ -791,9 +791,7 @@ def on_buttonbox_key_press_event(self, widget, event):
"""
keyval = event.keyval
state = event.state & gtk.accelerator_get_default_mod_mask()
if (keyval == keysyms.Escape or
(key_is_up(keyval) and
state == gdk.MOD1_MASK)):
if keyval == keysyms.Escape or (key_is_up(keyval) and state == gdk.MOD1_MASK):
self.popdown()
return True
return False
Expand Down
9 changes: 5 additions & 4 deletions deluge/ui/gtkui/preferences.py
Original file line number Diff line number Diff line change
Expand Up @@ -833,10 +833,11 @@ def on_toggle(self, widget):
except Exception:
return

path_choosers = {"download_location_path_chooser": self.download_location_path_chooser,
"move_completed_path_chooser": self.move_completed_path_chooser,
"torrentfiles_location_path_chooser": self.copy_torrent_files_path_chooser
}
path_choosers = {
"download_location_path_chooser": self.download_location_path_chooser,
"move_completed_path_chooser": self.move_completed_path_chooser,
"torrentfiles_location_path_chooser": self.copy_torrent_files_path_chooser
}

dependents = {
"chk_show_dialog": {"chk_focus_dialog": True},
Expand Down
3 changes: 1 addition & 2 deletions deluge/ui/gtkui/queuedtorrents.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ def __init__(self):
self.config = ConfigManager("gtkui.conf")
self.builder = gtk.Builder()
self.builder.add_from_file(deluge.common.resource_filename(
"deluge.ui.gtkui", os.path.join("glade", "queuedtorrents.ui"))
)
"deluge.ui.gtkui", os.path.join("glade", "queuedtorrents.ui")))
self.builder.get_object("chk_autoadd").set_active(self.config["autoadd_queued"])
self.dialog = self.builder.get_object("queued_torrents_dialog")
self.dialog.set_icon(get_logo(32))
Expand Down
3 changes: 1 addition & 2 deletions deluge/ui/gtkui/removetorrentdialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ def __init__(self, torrent_ids, delete_files=False):

self.builder = gtk.Builder()
self.builder.add_from_file(deluge.common.resource_filename(
"deluge.ui.gtkui", os.path.join("glade", "remove_torrent_dialog.ui"))
)
"deluge.ui.gtkui", os.path.join("glade", "remove_torrent_dialog.ui")))

self.__dialog = self.builder.get_object("remove_torrent_dialog")
self.__dialog.set_transient_for(component.get("MainWindow").window)
Expand Down
3 changes: 1 addition & 2 deletions deluge/ui/gtkui/systemtray.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ def enable(self):
"""Enables the system tray icon."""
self.builder = gtk.Builder()
self.builder.add_from_file(deluge.common.resource_filename(
"deluge.ui.gtkui", os.path.join("glade", "tray_menu.ui"))
)
"deluge.ui.gtkui", os.path.join("glade", "tray_menu.ui")))

self.builder.connect_signals({
"on_menuitem_show_deluge_activate": self.on_menuitem_show_deluge_activate,
Expand Down
33 changes: 17 additions & 16 deletions deluge/ui/gtkui/torrentview_data_funcs.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,23 @@
# Cache the key used to calculate the current value set for the specific cell
# renderer. This is much cheaper than fetch the current value and test if
# it's equal.
func_last_value = {"cell_data_speed_down": None,
"cell_data_speed_up": None,
"cell_data_time": None,
"cell_data_ratio_seeds_peers": None,
"cell_data_ratio_ratio": None,
"cell_data_ratio_avail": None,
"cell_data_date_added": None,
"cell_data_date_completed": None,
"cell_data_date_or_never": None,
"cell_data_speed_limit_down": None,
"cell_data_speed_limit_up": None,
"cell_data_trackericon": None,
"cell_data_statusicon": None,
"cell_data_queue": None,
"cell_data_progress": [None, None],
}
func_last_value = {
"cell_data_speed_down": None,
"cell_data_speed_up": None,
"cell_data_time": None,
"cell_data_ratio_seeds_peers": None,
"cell_data_ratio_ratio": None,
"cell_data_ratio_avail": None,
"cell_data_date_added": None,
"cell_data_date_completed": None,
"cell_data_date_or_never": None,
"cell_data_speed_limit_down": None,
"cell_data_speed_limit_up": None,
"cell_data_trackericon": None,
"cell_data_statusicon": None,
"cell_data_queue": None,
"cell_data_progress": [None, None],
}


def cell_data_statusicon(column, cell, model, row, data):
Expand Down
6 changes: 3 additions & 3 deletions deluge/ui/web/json_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -766,9 +766,9 @@ def on_info(info):
return client.daemon.info().addCallback(on_info)
else:
c = Client()
return c.connect(host, port, user, password
).addCallback(on_connect, c, host_id
).addErrback(on_connect_failed, host_id)
d = c.connect(host, port, user, password)
d.addCallback(on_connect, c, host_id).addErrback(on_connect_failed, host_id)
return d

@export
def start_daemon(self, port):
Expand Down

0 comments on commit 618d2f9

Please sign in to comment.