Python 3 compatibility

src/allmydata/test/test_introducer.py

@@ -1071,9 +1071,9 @@ class Signatures(SyncTestCase):
         (msg, sig, key) = sign_to_foolscap(ann, private_key)
         # Drop a base32 word from the middle of the key to invalidate the
         # signature.
-        sig_l = list(sig)
-        sig_l[20:22] = []
-        sig = b"".join(sig_l)
+        sig_a = bytearray(sig)
+        sig_a[20:22] = []
+        sig = bytes(sig_a)
         ann_t = (msg, sig, key)
         ic.got_announcements([ann_t])
 

src/allmydata/util/base32.py

@@ -140,7 +140,9 @@ def a2b(cs):
     # Add padding back, to make Python's base64 module happy:
     while (len(cs) * 5) % 8 != 0:
         cs += b"="
-    return base64.b32decode(cs)
+    # Let newbytes come through and still work on Python 2, where the base64
+    # module gets confused by them.
+    return base64.b32decode(backwardscompat_bytes(cs))
 
 
 __all__ = ["b2a", "a2b", "b2a_or_none", "BASE32CHAR_3bits", "BASE32CHAR_1bits", "BASE32CHAR", "BASE32STR_anybytes", "could_be_base32_encoded"]