Do not error if use_2to3 is set to a false value

pypa · Sep 7, 2021 · 646aa95 · 646aa95
1 parent b254ea7
commit 646aa95
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -124,7 +124,7 @@ distutils.setup_keywords =
 	dependency_links = setuptools.dist:assert_string_list
 	test_loader = setuptools.dist:check_importable
 	test_runner = setuptools.dist:check_importable
-	use_2to3 = setuptools.dist:invalid
+	use_2to3 = setuptools.dist:invalid_ignored_if_false
 egg_info.writers =
 	PKG-INFO = setuptools.command.egg_info:write_pkg_info
 	requires.txt = setuptools.command.egg_info:write_requirements

diff --git a/setuptools/dist.py b/setuptools/dist.py
@@ -289,8 +289,11 @@ def assert_bool(dist, attr, value):
         raise DistutilsSetupError(tmpl.format(attr=attr, value=value))
 
 
-def invalid(dist, attr, value):
-    raise DistutilsSetupError(f"{attr} is invalid.")
+def invalid_ignored_if_false(dist, attr, value):
+    if not value:
+        warnings.warn("{attr} is ignored")
+        return
+    raise DistutilsSetupError(f"{attr} is invalid if it is set to a true value.")
 
 
 def check_requirements(dist, attr, value):