Merge pull request #296 from BarrusInvestments/fix/294_wtf_014_regression

Add support for Flask-WTF 0.14

Author: lafrech

docs/changelog.rst

@@ -5,6 +5,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop you features).
+- Added Flask-WTF v0.14 support (#294).
 
 Changes in 0.9.0
 ================

flask_mongoengine/wtf/models.py

@@ -4,12 +4,12 @@
 class ModelForm(FlaskForm):
     """A WTForms mongoengine model form"""
 
-    def __init__(self, formdata=None, obj=None, **kwargs):
-        self.instance = (kwargs.pop('instance', None) or obj)
+    def __init__(self, formdata=None, **kwargs):
+        self.instance = (kwargs.pop('instance', None) or kwargs.get('obj'))
         if self.instance and not formdata:
-            obj = self.instance
+            kwargs['obj'] = self.instance
         self.formdata = formdata
-        super(ModelForm, self).__init__(formdata, obj, **kwargs)
+        super(ModelForm, self).__init__(formdata, **kwargs)
 
     def save(self, commit=True, **kwargs):
         if self.instance: