From dd4a0375c2145ac92a5b18b5f8c87fda4bf7807e Mon Sep 17 00:00:00 2001
From: Miguel Grinberg <miguelgrinberg50@gmail.com>
Date: Fri, 25 Nov 2016 16:02:58 -0800
Subject: [PATCH] updated flask.ext imports

---
 app/__init__.py  | 10 +++++-----
 app/emails.py    |  2 +-
 app/forms.py     |  4 ++--
 app/models.py    |  2 +-
 app/translate.py |  2 +-
 app/views.py     |  7 +++----
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index b3cbd93..4017104 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,11 +1,11 @@
 import os
 from flask import Flask
 from flask.json import JSONEncoder
-from flask.ext.sqlalchemy import SQLAlchemy
-from flask.ext.login import LoginManager
-from flask.ext.openid import OpenID
-from flask.ext.mail import Mail
-from flask.ext.babel import Babel, lazy_gettext
+from flask_sqlalchemy import SQLAlchemy
+from flask_login import LoginManager
+from flask_openid import OpenID
+from flask_mail import Mail
+from flask_babel import Babel, lazy_gettext
 from config import basedir, ADMINS, MAIL_SERVER, MAIL_PORT, MAIL_USERNAME, \
     MAIL_PASSWORD
 from .momentjs import momentjs
diff --git a/app/emails.py b/app/emails.py
index 4976a3d..52a7f97 100644
--- a/app/emails.py
+++ b/app/emails.py
@@ -1,5 +1,5 @@
 from flask import render_template
-from flask.ext.mail import Message
+from flask_mail import Message
 from app import mail
 from .decorators import async
 from config import ADMINS
diff --git a/app/forms.py b/app/forms.py
index 42f16ec..e1c7f59 100644
--- a/app/forms.py
+++ b/app/forms.py
@@ -1,5 +1,5 @@
-from flask.ext.wtf import Form
-from flask.ext.babel import gettext
+from flask_wtf import Form
+from flask_babel import gettext
 from wtforms import StringField, BooleanField, TextAreaField
 from wtforms.validators import DataRequired, Length
 from .models import User
diff --git a/app/models.py b/app/models.py
index bb17087..263c541 100644
--- a/app/models.py
+++ b/app/models.py
@@ -10,7 +10,7 @@ if sys.version_info >= (3, 0):
 else:
     enable_search = WHOOSH_ENABLED
     if enable_search:
-        import flask.ext.whooshalchemy as whooshalchemy
+        import flask_whooshalchemy
 
 
 followers = db.Table(
diff --git a/app/translate.py b/app/translate.py
index f7ec665..a939327 100644
--- a/app/translate.py
+++ b/app/translate.py
@@ -8,7 +8,7 @@ except ImportError:
     from urllib.parse import urlencode  # Python 3
 import json
 from app import app
-from flask.ext.babel import gettext
+from flask_babel import gettext
 from config import MS_TRANSLATOR_CLIENT_ID, MS_TRANSLATOR_CLIENT_SECRET
 
 
diff --git a/app/views.py b/app/views.py
index 9bfe169..50e5b0d 100644
--- a/app/views.py
+++ b/app/views.py
@@ -1,9 +1,8 @@
 from flask import render_template, flash, redirect, session, url_for, request, \
     g, jsonify
-from flask.ext.login import login_user, logout_user, current_user, \
-    login_required
-from flask.ext.sqlalchemy import get_debug_queries
-from flask.ext.babel import gettext
+from flask_login import login_user, logout_user, current_user, login_required
+from flask_sqlalchemy import get_debug_queries
+from flask_babel import gettext
 from datetime import datetime
 from guess_language import guessLanguage
 from app import app, db, lm, oid, babel