Merge pull request pallets-eco#937 from pallets/2.7-compat

get_ident compat for Python 2.7
inspirehep · Mar 18, 2021 · 59ede18 · 59ede18
2 parents c11fe63 + 0ac1040
commit 59ede18
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,11 @@
+Version 2.5.1
+-------------
+
+Unreleased
+
+-   Fix compatibility with Python 2.7.
+
+
 Version 2.5.0
 -------------
 

diff --git a/flask_sqlalchemy/__init__.py b/flask_sqlalchemy/__init__.py
@@ -36,7 +36,11 @@
 try:
     from greenlet import getcurrent as _ident_func
 except ImportError:
-    from threading import get_ident as _ident_func
+    try:
+        from threading import get_ident as _ident_func
+    except ImportError:
+        # Python 2.7
+        from thread import get_ident as _ident_func
 
 __version__ = "2.5.0"