From adad21eb0615bb68c47628dcd4d638137c3d1a01 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Fri, 25 Mar 2022 17:22:05 -0700 Subject: Upgrade to setuptools 61.1.0 This fixes Python 3.10 compat, but does remove Python2 compat. Test: treehugger Change-Id: I8e19ad8dec6b34482bfbe996413d3f793ada276c --- setuptools/_distutils/tests/py38compat.py | 62 +++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 setuptools/_distutils/tests/py38compat.py (limited to 'setuptools/_distutils/tests/py38compat.py') diff --git a/setuptools/_distutils/tests/py38compat.py b/setuptools/_distutils/tests/py38compat.py new file mode 100644 index 0000000..c949f58 --- /dev/null +++ b/setuptools/_distutils/tests/py38compat.py @@ -0,0 +1,62 @@ +# flake8: noqa + +import contextlib +import builtins +import sys + +from test.support import requires_zlib +import test.support + + +ModuleNotFoundError = getattr(builtins, 'ModuleNotFoundError', ImportError) + +try: + from test.support.warnings_helper import check_warnings +except (ModuleNotFoundError, ImportError): + from test.support import check_warnings + + +try: + from test.support.os_helper import ( + change_cwd, + rmtree, + EnvironmentVarGuard, + TESTFN, + unlink, + skip_unless_symlink, + temp_dir, + create_empty_file, + temp_cwd, + ) +except (ModuleNotFoundError, ImportError): + from test.support import ( + change_cwd, + rmtree, + EnvironmentVarGuard, + TESTFN, + unlink, + skip_unless_symlink, + temp_dir, + create_empty_file, + temp_cwd, + ) + + +# From Python 3.9 +@contextlib.contextmanager +def _save_restore_warnings_filters(): + old_filters = warnings.filters[:] + try: + yield + finally: + warnings.filters[:] = old_filters + + +try: + from test.support.warnings_helper import save_restore_warnings_filters +except (ModuleNotFoundError, ImportError): + save_restore_warnings_filters = _save_restore_warnings_filters + + +if sys.version_info < (3, 9): + requires_zlib = lambda: test.support.requires_zlib -- cgit v1.2.3