Directory with an empty pyproject.toml files is built into an sdist+wheel by setuptools 64

Fixes pypa#3511

Author: 3rdigen

_distutils_hack/__init__.py

@@ -199,3 +199,39 @@ def remove_shim():
     except ValueError:
         pass
 
+
+def extract_constant(code, symbol, default=-1):
+    """Extract the constant value of 'symbol' from 'code'
+
+    If the name 'symbol' is bound to a constant value by the Python code
+    object 'code', return that value.  If 'symbol' is bound to an expression,
+    return 'default'.  Otherwise, return 'None'.
+
+    Return value is based on the first assignment to 'symbol'.  'symbol' must
+    be a global, or at least a non-"fast" local in the code block.  That is,
+    only 'STORE_NAME' and 'STORE_GLOBAL' opcodes are checked, and 'symbol'
+    must be present in 'code.co_names'.
+    """
+    if symbol not in code.co_names:
+        # name's not there, can't possibly be an assignment
+        return None
+
+    name_idx = list(code.co_names).index(symbol)
+
+    STORE_NAME = 90
+    STORE_GLOBAL = 97
+    LOAD_CONST = 100
+
+    const = default
+
+    for byte_code in dis.Bytecode(code):
+        op = byte_code.opcode
+        arg = byte_code.arg
+
+        if op == LOAD_CONST:
+            const = code.co_consts[arg]
+        elif arg == name_idx and (op == STORE_NAME or op == STORE_GLOBAL):
+            return const
+        else:
+            const = default
+

setuptools/depends.py

@@ -1,16 +1,14 @@
 import sys
-import marshal
 import contextlib
-import dis
 
-from setuptools.extern.packaging import version # type: ignore
+from setuptools.extern.packaging import version
+from setuptools.get_module_constant import get_module_constant # type: ignore
 
-from ._imp import find_module, PY_COMPIED, PY_FROZEN, PY_SOURCE
-from . import _imp
+from ._imp import find_module, PY_COMPIED
 
 
 __all__ = [
-    'Require', 'find_module', 'get_module_constant', 'extract_constant'
+    'Require', 'find_module', , 'extract_constant'
 ]
 
 
@@ -93,71 +91,6 @@ def empty():
     return contextlib.closing(f)
 
 
-def get_module_constant(module, symbol, default=-1, paths=None):
-    """Find 'module' by searching 'paths', and extract 'symbol'
-
-    Return 'None' if 'module' does not exist on 'paths', or it does not define
-    'symbol'.  If the module defines 'symbol' as a constant, return the
-    constant.  Otherwise, return 'default'."""
-
-    try:
-        f, path, (suffix, mode, kind) = info = find_module(module, paths)
-    except ImportError:
-        # Module doesn't exist
-        return None
-
-    with maybe_close(f):
-        if kind == PY_COMPILED:
-            f.read(8)  # skip magic & date
-            code = marshal.load(f)
-        elif kind == PY_FROZEN:
-            code = _imp.get_frozen_object(module, paths)
-        elif kind == PY_SOURCE:
-            code = compile(f.read(), path, 'exec')
-        else:
-            # Not something we can parse; we'll have to import it.  :(
-            imported = _imp.get_module(module, paths, info)
-            return getattr(imported, symbol, None)
-
-    return extract_constant(code, symbol, default)
-
-
-def extract_constant(code, symbol, default=-1):
-    """Extract the constant value of 'symbol' from 'code'
-
-    If the name 'symbol' is bound to a constant value by the Python code
-    object 'code', return that value.  If 'symbol' is bound to an expression,
-    return 'default'.  Otherwise, return 'None'.
-
-    Return value is based on the first assignment to 'symbol'.  'symbol' must
-    be a global, or at least a non-"fast" local in the code block.  That is,
-    only 'STORE_NAME' and 'STORE_GLOBAL' opcodes are checked, and 'symbol'
-    must be present in 'code.co_names'.
-    """
-    if symbol not in code.co_names:
-        # name's not there, can't possibly be an assignment
-        return None
-
-    name_idx = list(code.co_names).index(symbol)
-
-    STORE_NAME = 90
-    STORE_GLOBAL = 97
-    LOAD_CONST = 100
-
-    const = default
-
-    for byte_code in dis.Bytecode(code):
-        op = byte_code.opcode
-        arg = byte_code.arg
-
-        if op == LOAD_CONST:
-            const = code.co_consts[arg]
-        elif arg == name_idx and (op == STORE_NAME or op == STORE_GLOBAL):
-            return const
-        else:
-            const = default
-
-
 def _update_globals():
     """
     Patch the globals to remove the objects not available on some platforms.

setuptools/get_module_constant.py

@@ -0,0 +1,36 @@
+from _distutils_hack import extract_constant
+from setuptools import _imp
+from setuptools._imp import PY_FROZEN, PY_SOURCE, find_module
+from setuptools.depends import maybe_close
+
+
+import marshal
+
+
+def get_module_constant(module, symbol, default=-1, paths=None):
+    """Find 'module' by searching 'paths', and extract 'symbol'
+
+    Return 'None' if 'module' does not exist on 'paths', or it does not define
+    'symbol'.  If the module defines 'symbol' as a constant, return the
+    constant.  Otherwise, return 'default'."""
+
+    try:
+        f, path, (suffix, mode, kind) = info = find_module(module, paths)
+    except ImportError:
+        # Module doesn't exist
+        return None
+
+    with maybe_close(f):
+        if kind == PY_COMPILED:
+            f.read(8)  # skip magic & date
+            code = marshal.load(f)
+        elif kind == PY_FROZEN:
+            code = _imp.get_frozen_object(module, paths)
+        elif kind == PY_SOURCE:
+            code = compile(f.read(), path, 'exec')
+        else:
+            # Not something we can parse; we'll have to import it.  :(
+            imported = _imp.get_module(module, paths, info)
+            return getattr(imported, symbol, None)
+
+    return extract_constant(code, symbol, default)

setuptools/tests/test_depends.py

@@ -1,6 +1,6 @@
 import sys
 
-from setuptools import depends
+from setuptools import get_module_constant
 
 
 class TestGetModuleConstant:
@@ -11,6 +11,6 @@ def test_basic(self):
         the test package.
         """
         mod_name = 'setuptools.tests.mod_with_constant'
-        val = depends.get_module_constant(mod_name, 'value')
+        val = get_module_constant.get_module_constant(mod_name, 'value')
         assert val == 'three, sir!'
         assert 'setuptools.tests.mod_with_constant' not in sys.modules

setuptools/tests/test_setuptools.py

@@ -9,6 +9,7 @@
 from distutils.core import Extension
 from zipfile import ZipFile
 
+import _distutils_hack
 import pytest
 
 from setuptools.extern.packaging import version
@@ -17,6 +18,7 @@
 import setuptools.dist
 import setuptools.depends as dep
 from setuptools.depends import Require
+import setuptools.get_module_constant
 
 
 @pytest.fixture(autouse=True)
@@ -58,16 +60,16 @@ def f1():
         fc = f1.__code__
 
         # unrecognized name
-        assert dep.extract_constant(fc, 'q', -1) is None
+        assert _distutils_hack.extract_constant(fc, 'q', -1) is None
 
         # constant assigned
-        dep.extract_constant(fc, 'x', -1) == "test"
+        _distutils_hack.extract_constant(fc, 'x', -1) == "test"
 
         # expression assigned
-        dep.extract_constant(fc, 'y', -1) == -1
+        _distutils_hack.extract_constant(fc, 'y', -1) == -1
 
         # recognized name, not assigned
-        dep.extract_constant(fc, 'z', -1) is None
+        _distutils_hack.extract_constant(fc, 'z', -1) is None
 
     def testFindModule(self):
         with pytest.raises(ImportError):
@@ -80,9 +82,9 @@ def testFindModule(self):
     @needs_bytecode
     def testModuleExtract(self):
         from json import __version__
-        assert dep.get_module_constant('json', '__version__') == __version__
-        assert dep.get_module_constant('sys', 'version') == sys.version
-        assert dep.get_module_constant(
+        assert setuptools.get_module_constant.get_module_constant('json', '__version__') == __version__
+        assert setuptools.get_module_constant.get_module_constant('sys', 'version') == sys.version
+        assert setuptools.get_module_constant.get_module_constant(
             'setuptools.tests.test_setuptools', '__doc__') == __doc__
 
     @needs_bytecode