Merge pull request #851 from tahoe-lafs/3464.cleanup-bbb-comments

#3455: Address feedback, BBB comments

misc/python3/Makefile

@@ -1,4 +1,4 @@
-# BBB: Python 3 porting targets
+# Python 3 porting targets
 #
 # NOTE: this Makefile requires GNU make
 

newsfragments/3464.minor

@@ -0,0 +1 @@
+Cleanup comments that don't match the project convention.

src/allmydata/node.py

@@ -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:

src/allmydata/scripts/common.py

@@ -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

src/allmydata/scripts/stats_gatherer.py

@@ -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

src/allmydata/scripts/tahoe_check.py

@@ -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

src/allmydata/stats.py

@@ -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

src/allmydata/test/check_load.py

@@ -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

src/allmydata/test/check_memory.py

@@ -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

src/allmydata/test/eliotutil.py

@@ -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

src/allmydata/test/mutable/test_version.py

@@ -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

src/allmydata/test/test_auth.py

@@ -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

src/allmydata/test/test_deepcheck.py

@@ -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*: