Merge pull request #1421 from a-detiste/master

finish removing "future"

newsfragments/4152.other

@@ -1 +1 @@
-remote more usage of deprecated future library
+remote all usage of deprecated future library

pyinstaller.spec

@@ -40,7 +40,6 @@ hidden_imports = [
     'commands',
     'Crypto',
     'functools',
-    'future.backports.misc',
     'itertools',
     'math',
     'packaging.specifiers',

pyproject.toml

@@ -117,6 +117,7 @@ dependencies = [
 
     "PyYAML >= 3.11",
 
+    # to be slowly removed from codebase
     "six >= 1.10.0",
 
     # For 'tahoe invite' and 'tahoe join'
@@ -133,9 +134,6 @@ dependencies = [
     # WebSocket library for twisted and asyncio
     "autobahn >= 22.4.3",
 
-    # Support for Python 3 transition
-    "future >= 0.18.2",
-
     # Discover local network configuration
     "netifaces",
 

src/allmydata/test/common.py

@@ -3,8 +3,6 @@ Functionality related to a lot of the test suite.
 """
 from __future__ import annotations
 
-from past.builtins import chr as byteschr
-
 __all__ = [
     "SyncTestCase",
     "AsyncTestCase",
@@ -127,6 +125,9 @@ EMPTY_CLIENT_CONFIG = config_from_string(
     ""
 )
 
+def byteschr(x):
+    return bytes([x])
+
 @attr.s
 class FakeDisk(object):
     """

src/allmydata/test/test_base62.py

@@ -4,8 +4,6 @@ Tests for allmydata.util.base62.
 Ported to Python 3.
 """
 
-from past.builtins import chr as byteschr
-
 import random, unittest
 
 from hypothesis import (
@@ -15,6 +13,9 @@ from hypothesis import (
 
 from allmydata.util import base62, mathutil
 
+def byteschr(x):
+    return bytes([x])
+
 def insecurerandstr(n):
     return bytes(list(map(random.randrange, [0]*n, [256]*n)))
 

src/allmydata/test/test_encode.py

@@ -2,8 +2,6 @@
 Ported to Python 3.
 """
 
-from past.builtins import chr as byteschr
-
 from zope.interface import implementer
 from twisted.trial import unittest
 from twisted.internet import defer
@@ -20,6 +18,9 @@ from allmydata.test.no_network import GridTestMixin
 class LostPeerError(Exception):
     pass
 
+def byteschr(x):
+    return bytes([x])
+
 def flip_bit(good): # flips the last bit
     return good[:-1] + byteschr(ord(good[-1]) ^ 0x01)
 

src/allmydata/test/test_system.py

@@ -3,7 +3,6 @@ Ported to Python 3.
 """
 from __future__ import annotations
 
-from past.builtins import chr as byteschr
 from six import ensure_text
 
 import os, re, sys, time, json
@@ -47,6 +46,8 @@ from .web.common import (
 from .common_system import SystemTestMixin
 from .common_util import run_cli_unicode
 
+def byteschr(x):
+    return bytes([x])
 
 class RunBinTahoeMixin(object):
     def run_bintahoe(self, args, stdin=None, python_options:Optional[list[str]]=None, env=None):

src/allmydata/util/base62.py

@@ -7,14 +7,15 @@ Ported to Python 3.
 maketrans = bytes.maketrans
 translate = bytes.translate
 
-from past.builtins import chr as byteschr
-
 from allmydata.util.mathutil import log_ceil, log_floor
 
 chars = b"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
 
 BASE62CHAR = b'[' + chars + b']'
 
+def byteschr(x):
+    return bytes([x])
+
 vals = b''.join([byteschr(i) for i in range(62)])
 c2vtranstable = maketrans(chars, vals)
 v2ctranstable = maketrans(vals, chars)

src/allmydata/util/hashutil.py

@@ -4,7 +4,8 @@ Hashing utilities.
 Ported to Python 3.
 """
 
-from past.builtins import chr as byteschr
+def byteschr(x):
+    return bytes([x])
 
 import os
 import hashlib