diff options
author | DjLegolas <djlegolas@protonmail.com> | 2021-12-25 14:34:49 +0200 |
---|---|---|
committer | Calum Lind <calumlind+deluge@gmail.com> | 2021-12-28 19:26:38 +0000 |
commit | 897955f0a164349d3191c778cfcb37ee9bff9daf (patch) | |
tree | fd91795cd3fd9a7e226e18e3e14008af3ba03247 /deluge/ui/web | |
parent | ff309ea4c5009049cdcb0ea876d9a98d84c52e14 (diff) | |
download | deluge-897955f0a164349d3191c778cfcb37ee9bff9daf.tar.gz deluge-897955f0a164349d3191c778cfcb37ee9bff9daf.tar.bz2 deluge-897955f0a164349d3191c778cfcb37ee9bff9daf.zip |
Remove all Python 2 supportdeluge-2.1.0.dev0
* Removed all __future__ imports from code
* Removed all six dependencies
* Removed all future_builtins imports
* Removed all Python 2 related code
Closes: deluge-torrent/deluge#325
Diffstat (limited to 'deluge/ui/web')
-rw-r--r-- | deluge/ui/web/__init__.py | 2 | ||||
-rw-r--r-- | deluge/ui/web/auth.py | 2 | ||||
-rw-r--r-- | deluge/ui/web/common.py | 6 | ||||
-rw-r--r-- | deluge/ui/web/json_api.py | 2 | ||||
-rw-r--r-- | deluge/ui/web/pluginmanager.py | 2 | ||||
-rw-r--r-- | deluge/ui/web/server.py | 2 | ||||
-rw-r--r-- | deluge/ui/web/web.py | 2 |
7 files changed, 1 insertions, 17 deletions
diff --git a/deluge/ui/web/__init__.py b/deluge/ui/web/__init__.py index 0be7eedb9..3757e0b1c 100644 --- a/deluge/ui/web/__init__.py +++ b/deluge/ui/web/__init__.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from deluge.ui.web.web import Web diff --git a/deluge/ui/web/auth.py b/deluge/ui/web/auth.py index d631f9186..9c8158a52 100644 --- a/deluge/ui/web/auth.py +++ b/deluge/ui/web/auth.py @@ -7,8 +7,6 @@ # See LICENSE for more details. # -from __future__ import unicode_literals - import hashlib import logging import os diff --git a/deluge/ui/web/common.py b/deluge/ui/web/common.py index 475f33565..a8c223d19 100644 --- a/deluge/ui/web/common.py +++ b/deluge/ui/web/common.py @@ -7,19 +7,15 @@ # See LICENSE for more details. # -from __future__ import unicode_literals - import gettext from mako.template import Template as MakoTemplate -from deluge.common import PY2, get_version +from deluge.common import get_version def _(text): text_local = gettext.gettext(text) - if PY2: - return text_local.decode('utf-8') return text_local diff --git a/deluge/ui/web/json_api.py b/deluge/ui/web/json_api.py index ffdee342c..822f65483 100644 --- a/deluge/ui/web/json_api.py +++ b/deluge/ui/web/json_api.py @@ -7,8 +7,6 @@ # See LICENSE for more details. # -from __future__ import division, unicode_literals - import json import logging import os diff --git a/deluge/ui/web/pluginmanager.py b/deluge/ui/web/pluginmanager.py index 24f20ce94..153d4977a 100644 --- a/deluge/ui/web/pluginmanager.py +++ b/deluge/ui/web/pluginmanager.py @@ -7,8 +7,6 @@ # See LICENSE for more details. # -from __future__ import unicode_literals - import logging import os diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py index 2f8921b22..3f079aefb 100644 --- a/deluge/ui/web/server.py +++ b/deluge/ui/web/server.py @@ -7,8 +7,6 @@ # See LICENSE for more details. # -from __future__ import unicode_literals - import fnmatch import json import logging diff --git a/deluge/ui/web/web.py b/deluge/ui/web/web.py index 4d0624791..0cefa13b4 100644 --- a/deluge/ui/web/web.py +++ b/deluge/ui/web/web.py @@ -7,8 +7,6 @@ # See LICENSE for more details. # -from __future__ import print_function, unicode_literals - import logging from twisted.internet.error import CannotListenError |