Module: deluge Branch: chunked-sessionproxy-and-gtkui-speedups Commit: 013f870c36fce2c5ac380e84037466fbce13d3d4
Author: Pedro Algarvio <[email protected]> Date: Mon May 16 04:03:26 2011 +0100 Merge branch 'master' into chunked-sessionproxy --- deluge/error.py | 4 +++- deluge/ui/gtkui/connectionmanager.py | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deluge/error.py b/deluge/error.py index ea7c646..90355c0 100644 --- a/deluge/error.py +++ b/deluge/error.py @@ -64,9 +64,11 @@ class InvalidTorrentError(DelugeError): class InvalidPathError(DelugeError): pass + class _ClientSideRecreateError(DelugeError): pass + class IncompatibleClient(_ClientSideRecreateError): def __init__(self, daemon_version): self.daemon_version = daemon_version @@ -76,7 +78,6 @@ class IncompatibleClient(_ClientSideRecreateError): ) % dict(daemon_version=self.daemon_version) class NotAuthorizedError(_ClientSideRecreateError): - def __init__(self, current_level, required_level): self.message = _( "Auth level too low: %(current_level)s < %(required_level)s" % @@ -86,6 +87,7 @@ class NotAuthorizedError(_ClientSideRecreateError): self.required_level = required_level + class _UsernameBasedPasstroughError(_ClientSideRecreateError): def _get_username(self): diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py index c76c80c..230e230 100644 --- a/deluge/ui/gtkui/connectionmanager.py +++ b/deluge/ui/gtkui/connectionmanager.py @@ -532,7 +532,6 @@ class ConnectionManager(component.Component): ) return dialog.run() - if try_counter: log.info("Retrying connection.. Retries left: %s", try_counter) return reactor.callLater( -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
