mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-23 14:52:26 +00:00
chore(refs #3455) Address feedback, BBB comments
https://github.com/tahoe-lafs/tahoe-lafs/pull/845#issuecomment-704469561
This commit is contained in:
parent
72cc37bb95
commit
95f2d53f92
misc/python3
newsfragments
src/allmydata
@ -1,4 +1,4 @@
|
||||
# BBB: Python 3 porting targets
|
||||
# Python 3 porting targets
|
||||
#
|
||||
# NOTE: this Makefile requires GNU make
|
||||
|
||||
|
1
newsfragments/3464.minor
Normal file
1
newsfragments/3464.minor
Normal file
@ -0,0 +1 @@
|
||||
Cleanup comments that don't match the project convention.
|
@ -13,7 +13,7 @@ from io import StringIO
|
||||
import tempfile
|
||||
from base64 import b32decode, b32encode
|
||||
|
||||
# BBB: Python 2 compatibility
|
||||
# Python 2 compatibility
|
||||
from six.moves import configparser
|
||||
from future.utils import PY2
|
||||
if PY2:
|
||||
|
@ -4,7 +4,7 @@ import os, sys, urllib, textwrap
|
||||
import codecs
|
||||
from os.path import join
|
||||
|
||||
# BBB: Python 2 compatibility
|
||||
# Python 2 compatibility
|
||||
from future.utils import PY2
|
||||
if PY2:
|
||||
from future.builtins import str # noqa: F401
|
||||
|
@ -2,7 +2,7 @@ from __future__ import print_function
|
||||
|
||||
import os
|
||||
|
||||
# BBB: Python 2 compatibility
|
||||
# Python 2 compatibility
|
||||
from future.utils import PY2
|
||||
if PY2:
|
||||
from future.builtins import str # noqa: F401
|
||||
|
@ -3,7 +3,7 @@ from __future__ import print_function
|
||||
import urllib
|
||||
import json
|
||||
|
||||
# BBB: Python 2 compatibility
|
||||
# Python 2 compatibility
|
||||
from future.utils import PY2
|
||||
if PY2:
|
||||
from future.builtins import str # noqa: F401
|
||||
|
@ -6,7 +6,7 @@ import pprint
|
||||
import time
|
||||
from collections import deque
|
||||
|
||||
# BBB: Python 2 compatibility
|
||||
# Python 2 compatibility
|
||||
from future.utils import PY2
|
||||
if PY2:
|
||||
from future.builtins import str # noqa: F401
|
||||
|
@ -37,7 +37,7 @@ a mean of 10kB and a max of 100MB, so filesize=min(int(1.0/random(.0002)),1e8)
|
||||
import os, sys, httplib, binascii
|
||||
import urllib, json, random, time, urlparse
|
||||
|
||||
# BBB: Python 2 compatibility
|
||||
# Python 2 compatibility
|
||||
from future.utils import PY2
|
||||
if PY2:
|
||||
from future.builtins import str # noqa: F401
|
||||
|
@ -2,7 +2,7 @@ from __future__ import print_function
|
||||
|
||||
import os, shutil, sys, urllib, time, stat, urlparse
|
||||
|
||||
# BBB: Python 2 compatibility
|
||||
# Python 2 compatibility
|
||||
from future.utils import PY2
|
||||
if PY2:
|
||||
from future.builtins import str # noqa: F401
|
||||
|
@ -2,7 +2,7 @@
|
||||
Tools aimed at the interaction between tests and Eliot.
|
||||
"""
|
||||
|
||||
# BBB: Python 2 compatibility
|
||||
# Python 2 compatibility
|
||||
# Can't use `builtins.str` because it's not JSON encodable:
|
||||
# `exceptions.TypeError: <class 'future.types.newstr.newstr'> is not JSON-encodeable`
|
||||
from past.builtins import unicode as str
|
||||
|
@ -2,7 +2,7 @@ from __future__ import print_function
|
||||
|
||||
import os
|
||||
|
||||
# BBB: Python 2 compatibility
|
||||
# Python 2 compatibility
|
||||
from future.utils import PY2
|
||||
if PY2:
|
||||
from future.builtins import str # noqa: F401
|
||||
|
@ -1,4 +1,4 @@
|
||||
# BBB: Python 2 compatibility
|
||||
# Python 2 compatibility
|
||||
from future.utils import PY2
|
||||
if PY2:
|
||||
from future.builtins import str # noqa: F401
|
||||
|
@ -1,6 +1,6 @@
|
||||
import os, json, urllib
|
||||
|
||||
# BBB: Python 2 compatibility
|
||||
# Python 2 compatibility
|
||||
# Can't use `builtins.str` because something deep in Twisted callbacks ends up repr'ing
|
||||
# a `future.types.newstr.newstr` as a *Python 3* byte string representation under
|
||||
# *Python 2*:
|
||||
|
Loading…
Reference in New Issue
Block a user