Remove License-Expression field

newsfragments/4706.feature.rst

@@ -1 +1 @@
-Added initial support for ``License-Expression`` (`PEP 639 <https://peps.python.org/pep-0639/#add-license-expression-field>`_). -- by :user:`cdce8p`
+Added initial support for license expression (`PEP 639 <https://peps.python.org/pep-0639/#add-license-expression-field>`_). -- by :user:`cdce8p`

setuptools/_core_metadata.py

@@ -175,12 +175,9 @@ def write_field(key, value):
         if attr_val is not None:
             write_field(field, attr_val)
 
-    if self.license_expression:
-        write_field('License-Expression', rfc822_escape(self.license_expression))
-    else:
-        license = self.get_license()
-        if license:
-            write_field('License', rfc822_escape(license))
+    license = self.license_expression or self.get_license()
+    if license:
+        write_field('License', rfc822_escape(license))
 
     for project_url in self.project_urls.items():
         write_field('Project-URL', '%s, %s' % project_url)

setuptools/tests/config/test_apply_pyprojecttoml.py

@@ -289,7 +289,7 @@ def test_utf8_maintainer_in_metadata(  # issue-3663
             PEP639_LICENSE_EXPRESSION,
             None,
             'MIT OR Apache-2.0',
-            'License-Expression: MIT OR Apache-2.0',
+            'License: MIT OR Apache-2.0',  # TODO Metadata version '2.4'
             id='license-expression',
         ),
     ),