From 19374c65876c14ea69dcc4a29fb9858fcbc3c749 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 4 Nov 2022 17:10:32 -0400
Subject: [PATCH] Bump requirement on importlib_metadata to 4.11.4. Fixes #526.

---
 CHANGES.rst                                | 6 ++++++
 hook-keyring.backend.py                    | 2 +-
 keyring/backend.py                         | 2 +-
 keyring/{py310compat.py => py312compat.py} | 2 +-
 setup.cfg                                  | 2 +-
 tests/test_packaging.py                    | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)
 rename keyring/{py310compat.py => py312compat.py} (82%)

diff --git a/CHANGES.rst b/CHANGES.rst
index 3259ca83..57daae65 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v23.10.0
+--------
+
+* #526: Bump requirement on ``importlib_metadata`` to pull in fix for
+  improperly-normalized names on egg-info.
+
 v23.9.3
 -------
 
diff --git a/hook-keyring.backend.py b/hook-keyring.backend.py
index 08be9253..b25df0c0 100644
--- a/hook-keyring.backend.py
+++ b/hook-keyring.backend.py
@@ -2,6 +2,6 @@
 Hook used by pyinstaller to expose hidden imports.
 """
 
-from keyring.py310compat import metadata
+from keyring.py312compat import metadata
 
 hiddenimports = [ep.value for ep in metadata.entry_points(group='keyring.backends')]
diff --git a/keyring/backend.py b/keyring/backend.py
index d19bc09a..1b903587 100644
--- a/keyring/backend.py
+++ b/keyring/backend.py
@@ -10,7 +10,7 @@
 
 from typing import Optional
 
-from .py310compat import metadata
+from .py312compat import metadata
 from . import credentials, errors, util
 from ._compat import properties
 
diff --git a/keyring/py310compat.py b/keyring/py312compat.py
similarity index 82%
rename from keyring/py310compat.py
rename to keyring/py312compat.py
index 3c7ee970..4b43fdeb 100644
--- a/keyring/py310compat.py
+++ b/keyring/py312compat.py
@@ -4,7 +4,7 @@
 __all__ = ['metadata']
 
 
-if sys.version_info > (3, 10):
+if sys.version_info > (3, 12):
     import importlib.metadata as metadata
 else:
     import importlib_metadata as metadata  # type: ignore
diff --git a/setup.cfg b/setup.cfg
index 54b1356c..73c501e2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,7 +23,7 @@ install_requires =
 	pywin32-ctypes!=0.1.0,!=0.1.1; sys_platform=="win32"
 	SecretStorage>=3.2; sys_platform=="linux"
 	jeepney>=0.4.2; sys_platform=="linux"
-	importlib_metadata >= 3.6; python_version < "3.10"
+	importlib_metadata >= 4.11.4; python_version < "3.12"
 	jaraco.classes
 
 [options.packages.find]
diff --git a/tests/test_packaging.py b/tests/test_packaging.py
index 383009d4..d559af70 100644
--- a/tests/test_packaging.py
+++ b/tests/test_packaging.py
@@ -1,5 +1,5 @@
 from keyring import backend
-from keyring.py310compat import metadata
+from keyring.py312compat import metadata
 
 
 def test_entry_point():