Update WorkingSet.find to consider standardised dist-info names

Author: abravalheri

pkg_resources/__init__.py

@@ -708,14 +708,15 @@ def find(self, req: Requirement) -> Distribution | None:
  If there is no active distribution for the requested project, ``None``
  is returned.
  """
- dist = self.by_key.get(req.key)
-
- if dist is None:
- canonical_key = self.normalized_to_canonical_keys.get(req.key)
-
- if canonical_key is not None:
- req.key = canonical_key
- dist = self.by_key.get(canonical_key)
+ for candidate in (
+ req.key,
+ self.normalized_to_canonical_keys.get(req.key),
+ safe_name(req.key).replace(".", "-"),
+ ):
+ dist = self.by_key.get(candidate)
+ if dist:
+ req.key = candidate
+ break
 
  if dist is not None and dist not in req:
  # XXX add more info

pkg_resources/tests/test_pkg_resources.py

@@ -477,5 +477,4 @@ def test_require_normalised_name(self, tmp_path, monkeypatch, name, version, req
 
  [dist] = ws.require(req)
  assert dist.version == version
- assert dist.project_name == name
  assert os.path.commonpath([dist.location, site_packages]) == site_packages