diff options
author | Calum Lind <calumlind+deluge@gmail.com> | 2017-03-16 21:39:57 +0000 |
---|---|---|
committer | Calum Lind <calumlind+deluge@gmail.com> | 2017-03-16 23:20:56 +0000 |
commit | af7e83bc76dc2db837ebcabba612dbccc9aac9e7 (patch) | |
tree | 025fbb6f57ca6f3513d218e59c78095abec729c0 /deluge/ui/web | |
parent | 4a274466acf55a8b5617b630ab4c7253827025bf (diff) | |
download | deluge-af7e83bc76dc2db837ebcabba612dbccc9aac9e7.tar.gz deluge-af7e83bc76dc2db837ebcabba612dbccc9aac9e7.tar.bz2 deluge-af7e83bc76dc2db837ebcabba612dbccc9aac9e7.zip |
Replace/remove usage of dict.keys()
Diffstat (limited to 'deluge/ui/web')
-rw-r--r-- | deluge/ui/web/auth.py | 4 | ||||
-rw-r--r-- | deluge/ui/web/json_api.py | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/deluge/ui/web/auth.py b/deluge/ui/web/auth.py index 4438004f6..d80327f57 100644 --- a/deluge/ui/web/auth.py +++ b/deluge/ui/web/auth.py @@ -90,10 +90,8 @@ class Auth(JSONComponent): self.worker.stop() def _clean_sessions(self): - session_ids = list(self.config['sessions'].keys()) - now = time.gmtime() - for session_id in session_ids: + for session_id in list(self.config['sessions']): session = self.config['sessions'][session_id] if 'expires' not in session: diff --git a/deluge/ui/web/json_api.py b/deluge/ui/web/json_api.py index ac946f627..72052f7da 100644 --- a/deluge/ui/web/json_api.py +++ b/deluge/ui/web/json_api.py @@ -899,7 +899,7 @@ class WebApi(JSONComponent): :type config: dictionary """ web_config = component.get('DelugeWeb').config - for key in config.keys(): + for key in config: if key in ['sessions', 'pwd_salt', 'pwd_sha1']: log.warn('Ignored attempt to overwrite web config key: %s', key) continue @@ -918,7 +918,7 @@ class WebApi(JSONComponent): """ return { - 'enabled_plugins': list(component.get('Web.PluginManager').plugins.keys()), + 'enabled_plugins': list(component.get('Web.PluginManager').plugins), 'available_plugins': component.get('Web.PluginManager').available_plugins } |