mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-19 13:07:56 +00:00
Port to Python 3.
This commit is contained in:
parent
ae7680759d
commit
044c79c4db
@ -1,12 +1,21 @@
|
|||||||
"""
|
"""
|
||||||
Tools aimed at the interaction between tests and Eliot.
|
Tools aimed at the interaction between tests and Eliot.
|
||||||
|
|
||||||
|
Ported to Python 3.
|
||||||
"""
|
"""
|
||||||
|
from __future__ import absolute_import
|
||||||
|
from __future__ import division
|
||||||
|
from __future__ import print_function
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
# Python 2 compatibility
|
# Python 2 compatibility
|
||||||
# Can't use `builtins.str` because it's not JSON encodable:
|
# Can't use `builtins.str` because it's not JSON encodable:
|
||||||
# `exceptions.TypeError: <class 'future.types.newstr.newstr'> is not JSON-encodeable`
|
# `exceptions.TypeError: <class 'future.types.newstr.newstr'> is not JSON-encodeable`
|
||||||
from past.builtins import unicode as str
|
from past.builtins import unicode as str
|
||||||
from future.utils import PY2
|
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, max, min # noqa: F401
|
||||||
|
|
||||||
from six import ensure_text
|
from six import ensure_text
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
|
@ -101,6 +101,7 @@ PORTED_MODULES = [
|
|||||||
"allmydata.test.cli_node_api",
|
"allmydata.test.cli_node_api",
|
||||||
"allmydata.test.common",
|
"allmydata.test.common",
|
||||||
"allmydata.test.common_web",
|
"allmydata.test.common_web",
|
||||||
|
"allmydata.test.eliotutil",
|
||||||
"allmydata.test.no_network",
|
"allmydata.test.no_network",
|
||||||
"allmydata.test.matchers",
|
"allmydata.test.matchers",
|
||||||
"allmydata.test.mutable",
|
"allmydata.test.mutable",
|
||||||
|
Loading…
Reference in New Issue
Block a user