Merge branch '4074-drop-pkg_resources' into 3072-python-3.12-support

src/allmydata/_auto_deps.py

@@ -1,88 +0,0 @@
-"""
-Ported to Python 3.
-"""
-
-from __future__ import unicode_literals
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-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, str, max, min  # noqa: F401
-
-# Note: please minimize imports in this file. In particular, do not import
-# any module from Tahoe-LAFS or its dependencies, and do not import any
-# modules at all at global level. That includes setuptools and pkg_resources.
-# It is ok to import modules from the Python Standard Library if they are
-# always available, or the import is protected by try...except ImportError.
-
-# Includes some indirect dependencies, but does not include allmydata.
-# These are in the order they should be listed by --version, etc.
-package_imports = [
-    # package name       module name
-    ('foolscap',         'foolscap'),
-    ('zfec',             'zfec'),
-    ('Twisted',          'twisted'),
-    ('zope.interface',   'zope.interface'),
-    ('python',           None),
-    ('platform',         None),
-    ('pyOpenSSL',        'OpenSSL'),
-    ('OpenSSL',          None),
-    ('pyasn1',           'pyasn1'),
-    ('service-identity', 'service_identity'),
-    ('pyasn1-modules',   'pyasn1_modules'),
-    ('cryptography',     'cryptography'),
-    ('cffi',             'cffi'),
-    ('six',              'six'),
-    ('enum34',           'enum'),
-    ('pycparser',        'pycparser'),
-    ('PyYAML',           'yaml'),
-    ('magic-wormhole',   'wormhole'),
-    ('eliot',            'eliot'),
-    ('attrs',            'attr'),
-    ('autobahn',         'autobahn'),
-]
-
-# Dependencies for which we don't know how to get a version number at run-time.
-not_import_versionable = [
-    'zope.interface',
-]
-
-# Dependencies reported by pkg_resources that we can safely ignore.
-ignorable = [
-    'argparse',
-    'distribute',
-    'twisted-web',
-    'twisted-core',
-    'twisted-conch',
-]
-
-
-# These are suppressed globally:
-
-global_deprecation_messages = [
-    "BaseException.message has been deprecated as of Python 2.6",
-    "twisted.internet.interfaces.IFinishableConsumer was deprecated in Twisted 11.1.0: Please use IConsumer (and IConsumer.unregisterProducer) instead.",
-    "twisted.internet.interfaces.IStreamClientEndpointStringParser was deprecated in Twisted 14.0.0: This interface has been superseded by IStreamClientEndpointStringParserWithReactor.",
-]
-
-# These are suppressed while importing dependencies:
-
-deprecation_messages = [
-    "the sha module is deprecated; use the hashlib module instead",
-    "object.__new__\(\) takes no parameters",
-    "The popen2 module is deprecated.  Use the subprocess module.",
-    "the md5 module is deprecated; use hashlib instead",
-    "twisted.web.error.NoResource is deprecated since Twisted 9.0.  See twisted.web.resource.NoResource.",
-    "the sets module is deprecated",
-]
-
-runtime_warning_messages = [
-    "Not using mpz_powm_sec.  You should rebuild using libgmp >= 5 to avoid timing attack vulnerability.",
-]
-
-warning_imports = [
-    'twisted.persisted.sob',
-    'twisted.python.filepath',
-]

src/allmydata/web/common.py

@@ -4,11 +4,10 @@ Ported to Python 3.
 from __future__ import annotations
 
 from six import ensure_str
-try:
+import sys
+if sys.version_info[:2] >= (3, 9):
     from importlib.resources import files as resource_files, as_file
-except ImportError:
-    import sys
-    assert sys.version_info[:2] < (3, 9)
+else:
     from importlib_resources import files as resource_files, as_file
 from contextlib import ExitStack
 import weakref