Merge pull request #478 from MongoEngine/make-wtfforms-completely-optional

Make WTFForms completely optional

Author: insspb

example_app/compose/flask/Dockerfile

@@ -1,6 +1,9 @@
 FROM python:3.7-slim as dev
 
 ENV PYTHONUNBUFFERED 1
+RUN apt-get update && \
+    apt-get install git -y --no-install-recommends && \
+    rm -rf /var/lib/apt/lists/*
 RUN groupadd -r flask && useradd -r -g flask flask
 COPY --chown=flask . /flask_mongoengine
 RUN pip install --upgrade pip  \

flask_mongoengine/__init__.py

@@ -9,7 +9,11 @@
 from flask_mongoengine.json import override_json_encoder
 from flask_mongoengine.pagination import *
 from flask_mongoengine.sessions import *
-from flask_mongoengine.wtf import db_fields
+
+try:
+    from flask_mongoengine.wtf import db_fields
+except ImportError:
+    from mongoengine import fields as db_fields
 
 
 def current_mongoengine_instance():

flask_mongoengine/wtf/__init__.py

@@ -1,2 +1 @@
 from flask_mongoengine.wtf.db_fields import *  # noqa
-from flask_mongoengine.wtf.orm import model_fields, model_form  # noqa

tests/test_forms.py

@@ -8,7 +8,7 @@
 from mongoengine import NotUniqueError, queryset_manager
 from werkzeug.datastructures import MultiDict
 
-from flask_mongoengine.wtf import model_form
+from flask_mongoengine.wtf.orm import model_form
 
 
 def test_binaryfield(app, db):