diff --git a/flask/notejam/__init__.py b/flask/notejam/__init__.py index 733f727e0..ceec080a2 100644 --- a/flask/notejam/__init__.py +++ b/flask/notejam/__init__.py @@ -1,7 +1,7 @@ from flask import Flask -from flask.ext.sqlalchemy import SQLAlchemy -from flask.ext.login import LoginManager -from flask.ext.mail import Mail +from flask_sqlalchemy import SQLAlchemy +from flask_login import LoginManager +from flask_mail import Mail from notejam.config import ( Config, DevelopmentConfig, diff --git a/flask/notejam/forms.py b/flask/notejam/forms.py index 1dc839622..10a0a6c49 100644 --- a/flask/notejam/forms.py +++ b/flask/notejam/forms.py @@ -1,6 +1,7 @@ -from flask.ext.wtf import (Form, TextField, PasswordField, +from flask_wtf import (Form) +from wtforms import (TextField, PasswordField, SelectField, TextAreaField) -from flask.ext.wtf import Required, Email, EqualTo, ValidationError +from wtforms.validators import Required, Email, EqualTo, ValidationError from notejam.models import User, Pad diff --git a/flask/notejam/models.py b/flask/notejam/models.py index 3bd36d401..fa717ffba 100755 --- a/flask/notejam/models.py +++ b/flask/notejam/models.py @@ -2,7 +2,7 @@ from werkzeug.security import (generate_password_hash, check_password_hash) -from flask.ext.login import UserMixin +from flask_login import UserMixin from notejam import db diff --git a/flask/notejam/templates/base.html b/flask/notejam/templates/base.html index f20662fb9..5a061688b 100644 --- a/flask/notejam/templates/base.html +++ b/flask/notejam/templates/base.html @@ -35,7 +35,7 @@