Merge pull request #937 from pallets/2.7-compat

get_ident compat for Python 2.7

Author: davidism

CHANGES.rst

@@ -1,3 +1,11 @@
+Version 2.5.1
+-------------
+
+Unreleased
+
+-   Fix compatibility with Python 2.7.
+
+
 Version 2.5.0
 -------------
 

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"