From 9204d1de2ae294b878ed726c8278b28696a91f87 Mon Sep 17 00:00:00 2001
From: Jonathan Kamens <jik@jik6.kamens.us>
Date: Wed, 25 Sep 2024 15:52:03 -0400
Subject: [PATCH 1/2] Use importlib instead of pkg_resources to determine
 package version

`pkg_resources` is deprecated and no longer available for import by
default as of Python 3.12.
---
 src/stopit/__init__.py | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/stopit/__init__.py b/src/stopit/__init__.py
index 6ca0180..d2fb01e 100644
--- a/src/stopit/__init__.py
+++ b/src/stopit/__init__.py
@@ -7,19 +7,25 @@
 Public resources from ``stopit``
 """
 
-import pkg_resources
+try:
+    from importlib.metadata import version
+    __version__ = version(__name__)
+except Exception:
+    # pkg_resources is deprecated as of Python 3.12 and no longer available for
+    # import by default.
+    try:
+        import pkg_resources
+    except Exception:
+        LOG.warning(
+            "Could not get the package version from importlib or pkg_resources")
+        __version__ = 'unknown'
+    else:
+        __version__ = pkg_resources.get_distribution(__name__).version
 
 from .utils import LOG, TimeoutException
 from .threadstop import ThreadingTimeout, async_raise, threading_timeoutable
 from .signalstop import SignalTimeout, signal_timeoutable
 
-# PEP 396 style version marker
-try:
-    __version__ = pkg_resources.get_distribution(__name__).version
-except:
-    LOG.warning("Could not get the package version from pkg_resources")
-    __version__ = 'unknown'
-
 __all__ = (
     'ThreadingTimeout', 'async_raise', 'threading_timeoutable',
     'SignalTimeout', 'signal_timeoutable'

From a2f6bde8a29cd281577426800b186802c68dbd86 Mon Sep 17 00:00:00 2001
From: Jonathan Kamens <jik@jik7>
Date: Mon, 28 Jul 2025 09:13:25 -0400
Subject: [PATCH 2/2] Import LOG before trying to use it

---
 src/stopit/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/stopit/__init__.py b/src/stopit/__init__.py
index d2fb01e..bbf7068 100644
--- a/src/stopit/__init__.py
+++ b/src/stopit/__init__.py
@@ -7,6 +7,8 @@
 Public resources from ``stopit``
 """
 
+from .utils import LOG, TimeoutException
+
 try:
     from importlib.metadata import version
     __version__ = version(__name__)
@@ -22,7 +24,6 @@
     else:
         __version__ = pkg_resources.get_distribution(__name__).version
 
-from .utils import LOG, TimeoutException
 from .threadstop import ThreadingTimeout, async_raise, threading_timeoutable
 from .signalstop import SignalTimeout, signal_timeoutable