diff options
| author | Mike Crute <mike@crute.us> | 2019-04-07 18:09:23 +0000 |
|---|---|---|
| committer | Mike Crute <mike@crute.us> | 2019-04-07 18:09:23 +0000 |
| commit | 88204c0999c49b79c6cf63a15f29dee5eadc31d6 (patch) | |
| tree | 670bc12e7ec7fdd4b9a1488b48f7c4f7ff2d2e08 | |
| parent | 179d8d9f24af843913b3cb87cae2252d43a06be9 (diff) | |
| download | pydora-88204c0999c49b79c6cf63a15f29dee5eadc31d6.tar.bz2 pydora-88204c0999c49b79c6cf63a15f29dee5eadc31d6.tar.xz pydora-88204c0999c49b79c6cf63a15f29dee5eadc31d6.zip | |
Remove python2 hack
| -rw-r--r-- | pandora/transport.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pandora/transport.py b/pandora/transport.py index 721882d..edec8a8 100644 --- a/pandora/transport.py +++ b/pandora/transport.py | |||
| @@ -256,10 +256,7 @@ class BlowfishCryptor: | |||
| 256 | 256 | ||
| 257 | @staticmethod | 257 | @staticmethod |
| 258 | def _strip_padding(data): | 258 | def _strip_padding(data): |
| 259 | try: | 259 | pad_size = int(data[-1]) |
| 260 | pad_size = int(data[-1]) # python3 | ||
| 261 | except ValueError: # pragma: no cover | ||
| 262 | pad_size = ord(data[-1]) # python2 | ||
| 263 | 260 | ||
| 264 | computed = b"".join([chr(pad_size).encode("ascii")] * pad_size) | 261 | computed = b"".join([chr(pad_size).encode("ascii")] * pad_size) |
| 265 | if not data[-pad_size:] == computed: | 262 | if not data[-pad_size:] == computed: |