diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-19 15:05:52 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-19 16:15:47 +0000 |
| commit | b686174b07bd56af4e5ffaa23c24f27f417fc305 (patch) | |
| tree | 1ce335620d99341d94e88c159c0b9b0f6f0de5a0 /deluge/bencode.py | |
| parent | Adding debian version 2.0.3-4. (diff) | |
| download | deluge-b686174b07bd56af4e5ffaa23c24f27f417fc305.tar.xz deluge-b686174b07bd56af4e5ffaa23c24f27f417fc305.zip | |
Merging upstream version 2.1.1 (Closes: #1026291).
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'deluge/bencode.py')
| -rw-r--r-- | deluge/bencode.py | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/deluge/bencode.py b/deluge/bencode.py index 0c2674b..b012ca0 100644 --- a/deluge/bencode.py +++ b/deluge/bencode.py @@ -9,13 +9,7 @@ # License. # Written by Petru Paler -# Updated by Calum Lind to support both Python 2 and Python 3. - -from __future__ import unicode_literals - -from sys import version_info - -PY2 = version_info.major == 2 +# Updated by Calum Lind to support Python 3. class BTFailure(Exception): @@ -90,7 +84,7 @@ def bdecode(x): return r -class Bencached(object): +class Bencached: __slots__ = ['bencoded'] @@ -146,10 +140,6 @@ encode_func[dict] = encode_dict encode_func[bool] = encode_bool encode_func[str] = encode_string encode_func[bytes] = encode_bytes -if PY2: - encode_func[long] = encode_int # noqa: F821 - encode_func[str] = encode_bytes - encode_func[unicode] = encode_string # noqa: F821 def bencode(x): |