Merge pull request #50 from Lee-W/master

Replace wtforms.ext.sqlalchemy with wtforms_sqlalchemy if it's installed
kvesteri · Jul 5, 2017 · 5f9a78b · 5f9a78b
2 parents 9d90385 + 8506a62
commit 5f9a78b
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/wtforms_json/__init__.py b/wtforms_json/__init__.py
@@ -3,13 +3,20 @@
 import six
 from wtforms import Form
 try:
-    from wtforms.ext.sqlalchemy.fields import (
+    from wtforms_sqlalchemy.fields import (
         QuerySelectField,
         QuerySelectMultipleField
     )
     HAS_SQLALCHEMY_SUPPORT = True
 except ImportError:
-    HAS_SQLALCHEMY_SUPPORT = False
+    try:
+        from wtforms.ext.sqlalchemy.fields import (
+            QuerySelectField,
+            QuerySelectMultipleField
+        )
+        HAS_SQLALCHEMY_SUPPORT = True
+    except ImportError:
+        HAS_SQLALCHEMY_SUPPORT = False
 from wtforms.fields import (
     _unset_value,
     BooleanField,