summaryrefslogtreecommitdiffstats
path: root/deluge/error.py
diff options
context:
space:
mode:
Diffstat (limited to 'deluge/error.py')
-rw-r--r--deluge/error.py18
1 files changed, 7 insertions, 11 deletions
diff --git a/deluge/error.py b/deluge/error.py
index 46e8e0cf1..d542dc2c0 100644
--- a/deluge/error.py
+++ b/deluge/error.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
#
# Copyright (C) 2008 Andrew Resch <andrewresch@gmail.com>
# Copyright (C) 2011 Pedro Algarvio <pedro@algarvio.me>
@@ -9,18 +8,15 @@
#
-from __future__ import unicode_literals
-
-
class DelugeError(Exception):
def __new__(cls, *args, **kwargs):
- inst = super(DelugeError, cls).__new__(cls, *args, **kwargs)
+ inst = super().__new__(cls, *args, **kwargs)
inst._args = args
inst._kwargs = kwargs
return inst
def __init__(self, message=None):
- super(DelugeError, self).__init__(message)
+ super().__init__(message)
self.message = message
def __str__(self):
@@ -45,12 +41,12 @@ class InvalidPathError(DelugeError):
class WrappedException(DelugeError):
def __init__(self, message, exception_type, traceback):
- super(WrappedException, self).__init__(message)
+ super().__init__(message)
self.type = exception_type
self.traceback = traceback
def __str__(self):
- return '%s\n%s' % (self.message, self.traceback)
+ return f'{self.message}\n{self.traceback}'
class _ClientSideRecreateError(DelugeError):
@@ -64,7 +60,7 @@ class IncompatibleClient(_ClientSideRecreateError):
'Your deluge client is not compatible with the daemon. '
'Please upgrade your client to %(daemon_version)s'
) % {'daemon_version': self.daemon_version}
- super(IncompatibleClient, self).__init__(message=msg)
+ super().__init__(message=msg)
class NotAuthorizedError(_ClientSideRecreateError):
@@ -73,14 +69,14 @@ class NotAuthorizedError(_ClientSideRecreateError):
'current_level': current_level,
'required_level': required_level,
}
- super(NotAuthorizedError, self).__init__(message=msg)
+ super().__init__(message=msg)
self.current_level = current_level
self.required_level = required_level
class _UsernameBasedPasstroughError(_ClientSideRecreateError):
def __init__(self, message, username):
- super(_UsernameBasedPasstroughError, self).__init__(message)
+ super().__init__(message)
self.username = username