Final merge fixes

src/packaging/metadata.py

@@ -134,7 +134,6 @@ class RawMetadata(TypedDict, total=False):
     license_files: list[str]
 
     # Metadata 2.5 - PEP 794
-    import_namespaces: list[str]
     import_names: list[str]
     import_namespaces: list[str]
 
@@ -888,8 +887,6 @@ def from_email(cls, data: bytes | str, *, validate: bool = True) -> Metadata:
     """:external:ref:`core-metadata-provides-dist`"""
     obsoletes_dist: _Validator[list[str] | None] = _Validator(added="1.2")
     """:external:ref:`core-metadata-obsoletes-dist`"""
-    import_namespaces: _Validator[list[str] | None] = _Validator(added="2.5")
-    """:external:ref:`XXX`"""
     import_names: _Validator[list[str] | None] = _Validator(added="2.5")
     """:external:ref:`XXX`"""
     import_namespaces: _Validator[list[str] | None] = _Validator(added="2.5")

tests/test_metadata.py

@@ -795,12 +795,12 @@ def test_invalid_import_names_identifier(self, key, name):
         meta = metadata.Metadata.from_raw({key: [name]}, validate=False)
 
         with pytest.raises(metadata.InvalidMetadata):
-            getattr(meta, key)  # noqa: B018
+            getattr(meta, key)
 
     @pytest.mark.parametrize("key", ["import_namespaces", "import_names"])
     def test_invalid_import_names_keyword(self, key):
         import_names = ["class"]
         meta = metadata.Metadata.from_raw({key: import_names}, validate=False)
 
         with pytest.raises(metadata.InvalidMetadata):
-            getattr(meta, key)  # noqa: B018
+            getattr(meta, key)