Flask Mongoengine WTForms update

CHANGELOG.md

@@ -2,7 +2,8 @@
 
 ## Current (in progress)
 
-- Nothing yet
+- Upgrade to Flask-Mongoengine 0.9.2, Flask-WTF 0.14.2, mongoengine 0.11.0.
+  [#812](https://github.com/opendatateam/udata/pull/812)
 
 ## 1.0.4 (2017-03-01)
 

requirements/install.pip

@@ -15,19 +15,19 @@ flask-fs==0.2.1
 Flask-Gravatar==0.4.2
 Flask-Login==0.3.2
 Flask-Mail==0.9.1
-flask-mongoengine==0.8.0
+flask-mongoengine==0.9.2
 Flask-Navigation==0.2.0
 Flask-OAuthlib==0.9.3
 flask-restplus==0.10.0
 Flask-Script==2.0.5
 Flask-Security==1.7.5
 Flask-Sitemap==0.2.0
 Flask-Themes2==0.1.4
-Flask-WTF==0.12
+Flask-WTF==0.14.2
 Flask==0.12
 html2text==2016.9.19
 lxml==3.7.3
-mongoengine==0.10.6
+mongoengine==0.11.0
 msgpack-python==0.4.8
 pillow==4.0.0
 bcrypt==3.1.3
@@ -39,7 +39,7 @@ redis==2.10.5
 requests==2.13.0
 unicodecsv==0.14.1
 voluptuous==0.9.3
-wtforms-json==0.2.10
+wtforms-json==0.3.0
 wtforms==2.1
 xmltodict==0.10.2
 geojson>=1.3.1

udata/app.py

@@ -15,7 +15,7 @@
 )
 from flask_caching import Cache
 
-from flask_wtf.csrf import CsrfProtect
+from flask_wtf.csrf import CSRFProtect
 from flask_navigation import Navigation
 from speaklater import is_lazy_string
 from werkzeug.contrib.fixers import ProxyFix
@@ -27,7 +27,7 @@
 log = logging.getLogger(__name__)
 
 cache = Cache()
-csrf = CsrfProtect()
+csrf = CSRFProtect()
 nav = Navigation()
 
 

udata/commands/db.py

@@ -9,8 +9,7 @@
 from flask import current_app
 
 from pymongo.errors import PyMongoError, OperationFailure
-from flask_mongoengine.connection import get_db
-from flask_mongoengine.connection import DEFAULT_CONNECTION_NAME
+from mongoengine.connection import get_db
 
 from udata.commands import submanager, green, yellow, cyan, purple, red
 
@@ -72,13 +71,13 @@
 
 def get_migration(plugin, filename):
     '''Get an existing migration record if exists'''
-    db = get_db(DEFAULT_CONNECTION_NAME)
+    db = get_db()
     return db.migrations.find_one({'plugin': plugin, 'filename': filename})
 
 
 def execute_migration(plugin, filename, script, dryrun=False):
     '''Execute and record a migration'''
-    db = get_db(DEFAULT_CONNECTION_NAME)
+    db = get_db()
     js = SCRIPT_WRAPPER.format(script)
     lines = script.splitlines()
     success = True
@@ -102,7 +101,7 @@ def execute_migration(plugin, filename, script, dryrun=False):
 
 def record_migration(plugin, filename, script, **kwargs):
     '''Only record a migration without applying it'''
-    db = get_db(DEFAULT_CONNECTION_NAME)
+    db = get_db()
     db.eval(RECORD_WRAPPER, plugin, filename, script)
     return True
 
@@ -172,7 +171,7 @@ def unrecord(plugin, filename):
     migration = get_migration(plugin, filename)
     if migration:
         log.info('Removing migration %s:%s', plugin, filename)
-        db = get_db(DEFAULT_CONNECTION_NAME)
+        db = get_db()
         db.eval(UNRECORD_WRAPPER, migration['_id'])
     else:
         log.error('Migration not found %s:%s', plugin, filename)

udata/core/jobs/forms.py

@@ -10,11 +10,11 @@
 class CrontabForm(ModelForm):
     model_class = PeriodicTask.Crontab
 
-    minute = fields.StringField(default='*')
-    hour = fields.StringField(default='*')
-    day_of_week = fields.StringField(default='*')
-    day_of_month = fields.StringField(default='*')
-    month_of_year = fields.StringField(default='*')
+    minute = fields.Field(default='*')
+    hour = fields.Field(default='*')
+    day_of_week = fields.Field(default='*')
+    day_of_month = fields.Field(default='*')
+    month_of_year = fields.Field(default='*')
 
 
 class IntervalForm(ModelForm):

udata/core/spatial/forms.py

@@ -6,7 +6,7 @@
 import logging
 
 from udata.forms import widgets, ModelForm, validators
-from udata.forms.fields import ModelList, StringField, SelectField, FormField
+from udata.forms.fields import ModelList, Field, SelectField, FormField
 from udata.i18n import lazy_gettext as _
 
 from .models import GeoZone, SpatialCoverage, spatial_granularities
@@ -27,12 +27,12 @@ def __call__(self, field, **kwargs):
         return super(ZonesAutocompleter, self).__call__(field, **kwargs)
 
 
-class ZonesField(ModelList, StringField):
+class ZonesField(ModelList, Field):
     model = GeoZone
     widget = ZonesAutocompleter()
 
 
-class GeomField(StringField):
+class GeomField(Field):
     def process_formdata(self, valuelist):
         if valuelist:
             value = valuelist[0]

udata/core/spatial/tests/test_fields.py

@@ -45,15 +45,15 @@ def test_initial_geom(self):
         geom = faker.multipolygon()
 
         fake = Fake(spatial=SpatialCoverage(geom=geom))
-        form = FakeForm(None, fake)
+        form = FakeForm(None, obj=fake)
         self.assertEqual(form.spatial.geom.data, geom)
 
     def test_initial_zones(self):
         Fake, FakeForm = self.factory()
         zones = [GeoZoneFactory() for _ in range(3)]
 
         fake = Fake(spatial=SpatialCoverage(zones=zones))
-        form = FakeForm(None, fake)
+        form = FakeForm(None, obj=fake)
         self.assertEqual(
             form.spatial.zones._value(), ','.join([z.id for z in zones]))
 
@@ -224,7 +224,7 @@ def test_with_initial_zones(self):
         zone = GeoZoneFactory()
         data = MultiDict({'spatial-zones': zone.id})
 
-        form = FakeForm(data, fake)
+        form = FakeForm(data, obj=fake)
 
         form.validate()
         self.assertEqual(form.errors, {})
@@ -245,7 +245,7 @@ def test_with_initial_granularity(self):
 
         data = MultiDict({'spatial-granularity': granularity})
 
-        form = FakeForm(data, fake)
+        form = FakeForm(data, obj=fake)
 
         form.validate()
         self.assertEqual(form.errors, {})
@@ -279,7 +279,7 @@ def test_with_initial_none(self):
         form = FakeForm(MultiDict({
             'spatial-zones': str(zone.id),
             'spatial-granularity': faker.spatial_granularity()
-        }), fake)
+        }), obj=fake)
 
         form.validate()
         self.assertEqual(form.errors, {})

udata/forms/__init__.py

@@ -8,7 +8,7 @@
 from flask_mongoengine.wtf import model_form  # noqa
 
 from flask_mongoengine.wtf.models import ModelForm as MEModelForm  # noqa
-from flask_wtf import Form as WTForm  # noqa
+from flask_wtf import FlaskForm  # noqa
 
 from udata import i18n  # noqa
 
@@ -22,7 +22,7 @@ def process(self, formdata=None, obj=None, data=None, **kwargs):
         super(CommonFormMixin, self).process(formdata, obj, data, **kwargs)
 
 
-class Form(CommonFormMixin, WTForm):
+class Form(CommonFormMixin, FlaskForm):
     pass