Port to Python 3.

This commit is contained in:
Itamar Turner-Trauring 2021-02-18 11:52:42 -05:00
parent de0365a54b
commit cbb2cfc028
2 changed files with 13 additions and 2 deletions

View File

@ -119,6 +119,7 @@ PORTED_MODULES = [
"allmydata.web.common",
"allmydata.web.check_results",
"allmydata.web.filenode",
"allmydata.web.info",
"allmydata.web.logs",
"allmydata.webish",
]

View File

@ -1,4 +1,14 @@
from past.builtins import unicode
"""
Ported to Python 3.
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
from future.utils import PY2
if PY2:
from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min # noqa: F401
import os
from urllib.parse import quote as urlquote
@ -47,7 +57,7 @@ class MoreInfoElement(Element):
def abbrev(self, storage_index_or_none):
if storage_index_or_none:
return unicode(base32.b2a(storage_index_or_none)[:6], "ascii")
return str(base32.b2a(storage_index_or_none)[:6], "ascii")
return "LIT file"
def get_type(self):