Upgrade codebase with pyupgrade (>=py3.6)

Added pyupgrade utility with manual stage to pre-commit and run on all
files.

Ref: https://github.com/asottile/pyupgrade
Closes: deluge-torrent/deluge#326

6 files changed, 22 insertions, 33 deletions

diff --git a/deluge/ui/web/auth.py b/deluge/ui/web/auth.py
index 9c8158a52..eacbbf526 100644
--- a/deluge/ui/web/auth.py
+++ b/deluge/ui/web/auth.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009 Damien Churchill <damoxc@gmail.com>
 #
@@ -62,7 +61,7 @@ class Auth(JSONComponent):
     """
 
     def __init__(self, config):
-        super(Auth, self).__init__('Auth')
+        super().__init__('Auth')
         self.worker = LoopingCall(self._clean_sessions)
         self.config = config
 
diff --git a/deluge/ui/web/common.py b/deluge/ui/web/common.py
index a8c223d19..32c29c8c0 100644
--- a/deluge/ui/web/common.py
+++ b/deluge/ui/web/common.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009 Damien Churchill <damoxc@gmail.com>
 #
diff --git a/deluge/ui/web/json_api.py b/deluge/ui/web/json_api.py
index 822f65483..aa15d5ac6 100644
--- a/deluge/ui/web/json_api.py
+++ b/deluge/ui/web/json_api.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009-2010 Damien Churchill <damoxc@gmail.com>
 #
@@ -37,7 +36,7 @@ log = logging.getLogger(__name__)
 
 class JSONComponent(component.Component):
     def __init__(self, name, interval=1, depend=None):
-        super(JSONComponent, self).__init__(name, interval, depend)
+        super().__init__(name, interval, depend)
         self._json = component.get('JSON')
         self._json.register_object(self, name)
 
@@ -144,7 +143,7 @@ class JSON(resource.Resource, component.Component):
             params = request_data['params']
             request_id = request_data['id']
         except KeyError as ex:
-            message = 'Invalid JSON request, missing param %s in %s' % (
+            message = 'Invalid JSON request, missing param {} in {}'.format(
                 ex,
                 request_data,
             )
@@ -165,7 +164,7 @@ class JSON(resource.Resource, component.Component):
         except Exception as ex:
             log.error('Error calling method `%s`: %s', method, ex)
             log.exception(ex)
-            error = {'message': '%s: %s' % (ex.__class__.__name__, str(ex)), 'code': 3}
+            error = {'message': f'{ex.__class__.__name__}: {str(ex)}', 'code': 3}
 
         return request_id, result, error
 
@@ -182,7 +181,7 @@ class JSON(resource.Resource, component.Component):
         """
         log.error(reason)
         response['error'] = {
-            'message': '%s: %s' % (reason.__class__.__name__, str(reason)),
+            'message': f'{reason.__class__.__name__}: {str(reason)}',
             'code': 4,
         }
         return self._send_response(request, response)
@@ -219,7 +218,7 @@ class JSON(resource.Resource, component.Component):
             'id': None,
             'error': {
                 'code': 5,
-                'message': '%s: %s' % (reason.__class__.__name__, str(reason)),
+                'message': f'{reason.__class__.__name__}: {str(reason)}',
             },
         }
         return self._send_response(request, response)
@@ -286,7 +285,7 @@ class JSON(resource.Resource, component.Component):
 FILES_KEYS = ['files', 'file_progress', 'file_priorities']
 
 
-class EventQueue(object):
+class EventQueue:
     """
     This class subscribes to events from the core and stores them until all
     the subscribed listeners have received the events.
@@ -379,7 +378,7 @@ class WebApi(JSONComponent):
     XSS_VULN_KEYS = ['name', 'message', 'comment', 'tracker_status', 'peers']
 
     def __init__(self):
-        super(WebApi, self).__init__('Web', depend=['SessionProxy'])
+        super().__init__('Web', depend=['SessionProxy'])
         self.hostlist = HostList()
         self.core_config = CoreConfig()
         self.event_queue = EventQueue()
@@ -1004,7 +1003,7 @@ class WebUtils(JSONComponent):
     """
 
     def __init__(self):
-        super(WebUtils, self).__init__('WebUtils')
+        super().__init__('WebUtils')
 
     @export
     def get_languages(self):
diff --git a/deluge/ui/web/pluginmanager.py b/deluge/ui/web/pluginmanager.py
index 153d4977a..2da5b6177 100644
--- a/deluge/ui/web/pluginmanager.py
+++ b/deluge/ui/web/pluginmanager.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009 Damien Churchill <damoxc@gmail.com>
 #
@@ -72,22 +71,20 @@ class PluginManager(PluginManagerBase, component.Component):
 
         scripts = component.get('Scripts')
         for script in info['scripts']:
-            scripts.remove_script(
-                '%s/%s' % (name.lower(), os.path.basename(script).lower())
-            )
+            scripts.remove_script(f'{name.lower()}/{os.path.basename(script).lower()}')
 
         for script in info['debug_scripts']:
             scripts.remove_script(
-                '%s/%s' % (name.lower(), os.path.basename(script).lower()), 'debug'
+                f'{name.lower()}/{os.path.basename(script).lower()}', 'debug'
             )
             scripts.remove_script(
-                '%s/%s' % (name.lower(), os.path.basename(script).lower()), 'dev'
+                f'{name.lower()}/{os.path.basename(script).lower()}', 'dev'
             )
 
-        super(PluginManager, self).disable_plugin(name)
+        super().disable_plugin(name)
 
     def enable_plugin(self, name):
-        super(PluginManager, self).enable_plugin(name)
+        super().enable_plugin(name)
 
         # Get the plugin instance
         try:
@@ -103,17 +100,15 @@ class PluginManager(PluginManagerBase, component.Component):
         scripts = component.get('Scripts')
         for script in info['scripts']:
             log.debug('adding script %s for %s', name, os.path.basename(script))
-            scripts.add_script(
-                '%s/%s' % (name.lower(), os.path.basename(script)), script
-            )
+            scripts.add_script(f'{name.lower()}/{os.path.basename(script)}', script)
 
         for script in info['debug_scripts']:
             log.debug('adding debug script %s for %s', name, os.path.basename(script))
             scripts.add_script(
-                '%s/%s' % (name.lower(), os.path.basename(script)), script, 'debug'
+                f'{name.lower()}/{os.path.basename(script)}', script, 'debug'
             )
             scripts.add_script(
-                '%s/%s' % (name.lower(), os.path.basename(script)), script, 'dev'
+                f'{name.lower()}/{os.path.basename(script)}', script, 'dev'
             )
 
     def start(self):
@@ -149,11 +144,10 @@ class PluginManager(PluginManagerBase, component.Component):
         info = gather_info(plugin)
         info['name'] = name
         info['scripts'] = [
-            'js/%s/%s' % (name.lower(), os.path.basename(s)) for s in info['scripts']
+            f'js/{name.lower()}/{os.path.basename(s)}' for s in info['scripts']
         ]
         info['debug_scripts'] = [
-            'js/%s/%s' % (name.lower(), os.path.basename(s))
-            for s in info['debug_scripts']
+            f'js/{name.lower()}/{os.path.basename(s)}' for s in info['debug_scripts']
         ]
         del info['script_directories']
         return info
diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py
index 3f079aefb..f391a78d2 100644
--- a/deluge/ui/web/server.py
+++ b/deluge/ui/web/server.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009-2010 Damien Churchill <damoxc@gmail.com>
 #
@@ -373,7 +372,7 @@ class ScriptResource(resource.Resource, component.Component):
 
                     order_file = os.path.join(root, '.order')
                     if os.path.isfile(order_file):
-                        with open(order_file, 'r') as _file:
+                        with open(order_file) as _file:
                             for line in _file:
                                 if line.startswith('+ '):
                                     order_filename = line.split()[1]
diff --git a/deluge/ui/web/web.py b/deluge/ui/web/web.py
index 0cefa13b4..f855bd06c 100644
--- a/deluge/ui/web/web.py
+++ b/deluge/ui/web/web.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009 Damien Churchill <damoxc@gmail.com>
 #
@@ -22,7 +21,7 @@ class Web(UI):
     cmd_description = """Web-based user interface (http://localhost:8112)"""
 
     def __init__(self, *args, **kwargs):
-        super(Web, self).__init__(
+        super().__init__(
             'web', *args, description='Starts the Deluge Web interface', **kwargs
         )
         self.__server = None
@@ -65,7 +64,7 @@ class Web(UI):
         return self.__server
 
     def start(self):
-        super(Web, self).start()
+        super().start()
 
         from deluge.ui.web import server