Merge branch 'hotfix/1.3.1'

getlogbook · Apr 12, 2018 · 19fbbe3 · 19fbbe3
2 parents accfb34 + 2240917
commit 19fbbe3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/logbook/__version__.py b/logbook/__version__.py
@@ -1 +1 @@
-__version__ = "1.3.0"
+__version__ = "1.3.1"
diff --git a/logbook/concurrency.py b/logbook/concurrency.py
@@ -28,10 +28,12 @@ def is_gevent_enabled():
 
 
 if has_gevent:
-    from gevent._threading import (Lock as ThreadLock,
-                                   RLock as ThreadRLock,
-                                   get_ident as thread_get_ident,
-                                   local as thread_local)
+    from gevent.monkey import get_original as _get_original
+    Lock = _get_original('threading', 'Lock')
+    RLock = _get_original('threading', 'RLock')
+    get_ident = _get_original('threading', 'get_ident')
+    local = _get_original('threading', 'local')
+
     from gevent.thread import get_ident as greenlet_get_ident
     from gevent.local import local as greenlet_local
     from gevent.lock import BoundedSemaphore