Merge pull request #2876 from gentlegiantJGC/main

jaraco · web-flow · commit 577af8b46e09 · 2022-02-12T05:39:08.000-05:00
Fixed string list concatenation error
diff --git a/changelog.d/2876.change.rst b/changelog.d/2876.change.rst
@@ -0,0 +1 @@
+In the build backend, allow single config settings to be supplied.
diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
@@ -38,6 +38,8 @@
 import setuptools
 import distutils
 from ._reqs import parse_strings
+from .extern.more_itertools import always_iterable
+
 
 __all__ = ['get_requires_for_build_sdist',
            'get_requires_for_build_wheel',
@@ -127,9 +129,24 @@ def suppress_known_deprecation():
 
 class _BuildMetaBackend:
 
-    def _fix_config(self, config_settings):
+    @staticmethod
+    def _fix_config(config_settings):
+        """
+        Ensure config settings meet certain expectations.
+
+        >>> fc = _BuildMetaBackend._fix_config
+        >>> fc(None)
+        {'--global-option': []}
+        >>> fc({})
+        {'--global-option': []}
+        >>> fc({'--global-option': 'foo'})
+        {'--global-option': ['foo']}
+        >>> fc({'--global-option': ['foo']})
+        {'--global-option': ['foo']}
+        """
         config_settings = config_settings or {}
-        config_settings.setdefault('--global-option', [])
+        config_settings['--global-option'] = list(always_iterable(
+            config_settings.get('--global-option')))
         return config_settings
 
     def _get_build_requires(self, config_settings, requirements):

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+In the build backend, allow single config settings to be supplied.`