Got rid of extension import magic from flask

Gonna be deprecated with 1.0 anyway so better do it now.
Follow this link for more information:
pallets/flask#1182

flaskbb/app.py

@@ -17,7 +17,7 @@
 from sqlalchemy.engine import Engine
 
 from flask import Flask, request
-from flask.ext.login import current_user
+from flask_login import current_user
 
 # Import the user blueprint
 from flaskbb.user.views import user

flaskbb/auth/forms.py

@@ -10,12 +10,12 @@
 """
 from datetime import datetime
 
-from flask.ext.wtf import Form, RecaptchaField
+from flask_wtf import Form, RecaptchaField
 from wtforms import (StringField, PasswordField, BooleanField, HiddenField,
                      SubmitField)
 from wtforms.validators import (DataRequired, InputRequired, Email, EqualTo,
                                 regexp, ValidationError)
-from flask.ext.babelex import lazy_gettext as _
+from flask_babelex import lazy_gettext as _
 
 from flaskbb.user.models import User
 

flaskbb/auth/views.py

@@ -10,9 +10,9 @@
     :license: BSD, see LICENSE for more details.
 """
 from flask import Blueprint, flash, redirect, url_for, request, current_app
-from flask.ext.login import (current_user, login_user, login_required,
-                             logout_user, confirm_login, login_fresh)
-from flask.ext.babelex import gettext as _
+from flask_login import (current_user, login_user, login_required,
+                         logout_user, confirm_login, login_fresh)
+from flask_babelex import gettext as _
 
 from flaskbb.utils.helpers import render_template
 from flaskbb.email import send_reset_token

flaskbb/email.py

@@ -9,8 +9,8 @@
     :license: BSD, see LICENSE for more details.
 """
 from flask import render_template
-from flask.ext.mail import Message
-from flask.ext.babelex import lazy_gettext as _
+from flask_mail import Message
+from flask_babelex import lazy_gettext as _
 
 from flaskbb.extensions import mail
 

flaskbb/extensions.py

@@ -8,16 +8,16 @@
     :copyright: (c) 2014 by the FlaskBB Team.
     :license: BSD, see LICENSE for more details.
 """
-from flask.ext.sqlalchemy import SQLAlchemy
-from flask.ext.login import LoginManager
-from flask.ext.mail import Mail
-from flask.ext.cache import Cache
-from flask.ext.debugtoolbar import DebugToolbarExtension
-from flask.ext.redis import Redis
-from flask.ext.migrate import Migrate
-from flask.ext.themes2 import Themes
-from flask.ext.plugins import PluginManager
-from flask.ext.babelex import Babel
+from flask_sqlalchemy import SQLAlchemy
+from flask_login import LoginManager
+from flask_mail import Mail
+from flask_cache import Cache
+from flask_debugtoolbar import DebugToolbarExtension
+from flask_redis import Redis
+from flask_migrate import Migrate
+from flask_themes2 import Themes
+from flask_plugins import PluginManager
+from flask_babelex import Babel
 
 # Database
 db = SQLAlchemy()

flaskbb/fixtures/settings.py

@@ -8,7 +8,7 @@
     :copyright: (c) 2014 by the FlaskBB Team.
     :license: BSD, see LICENSE for more details.
 """
-from flask.ext.themes2 import get_themes_list
+from flask_themes2 import get_themes_list
 
 from flaskbb.extensions import babel
 

flaskbb/forum/forms.py

@@ -8,11 +8,11 @@
     :copyright: (c) 2014 by the FlaskBB Team.
     :license: BSD, see LICENSE for more details.
 """
-from flask.ext.wtf import Form
+from flask_wtf import Form
 from wtforms import (TextAreaField, StringField, SelectMultipleField,
                      BooleanField, SubmitField)
 from wtforms.validators import DataRequired, Optional, Length
-from flask.ext.babelex import lazy_gettext as _
+from flask_babelex import lazy_gettext as _
 
 from flaskbb.forum.models import Topic, Post, Report, Forum
 from flaskbb.user.models import User
@@ -25,7 +25,7 @@ class QuickreplyForm(Form):
     submit = SubmitField(_("Reply"))
 
     def save(self, user, topic):
-        post = Post(**self.data)
+        post = Post(content=self.content.data)
         return post.save(user=user, topic=topic)
 
 

flaskbb/forum/views.py

@@ -13,8 +13,8 @@
 
 from flask import (Blueprint, redirect, url_for, current_app,
                    request, flash)
-from flask.ext.login import login_required, current_user
-from flask.ext.babelex import gettext as _
+from flask_login import login_required, current_user
+from flask_babelex import gettext as _
 
 from flaskbb.extensions import db
 from flaskbb.utils.settings import flaskbb_config

flaskbb/management/forms.py

@@ -8,14 +8,14 @@
     :copyright: (c) 2014 by the FlaskBB Team.
     :license: BSD, see LICENSE for more details.
 """
-from flask.ext.wtf import Form
+from flask_wtf import Form
 from wtforms import (StringField, TextAreaField, PasswordField, IntegerField,
                      BooleanField, SelectField, DateField, SubmitField)
 from wtforms.validators import (DataRequired, Optional, Email, regexp, Length,
                                 URL, ValidationError)
 from wtforms.ext.sqlalchemy.fields import (QuerySelectField,
                                            QuerySelectMultipleField)
-from flask.ext.babelex import lazy_gettext as _
+from flask_babelex import lazy_gettext as _
 
 from flaskbb.utils.widgets import SelectDateWidget
 from flaskbb.extensions import db

flaskbb/management/models.py

@@ -10,7 +10,8 @@
 """
 from wtforms import (TextField, IntegerField, FloatField, BooleanField,
                      SelectField, SelectMultipleField, validators)
-from flask.ext.wtf import Form
+from flask_wtf import Form
+
 from flaskbb._compat import max_integer, text_type, iteritems
 from flaskbb.extensions import db, cache
 

flaskbb/management/views.py

@@ -14,9 +14,9 @@
 
 from flask import (Blueprint, current_app, request, redirect, url_for, flash,
                    __version__ as flask_version)
-from flask.ext.login import current_user
-from flask.ext.plugins import get_all_plugins, get_plugin, get_plugin_from_all
-from flask.ext.babelex import gettext as _
+from flask_login import current_user
+from flask_plugins import get_all_plugins, get_plugin, get_plugin_from_all
+from flask_babelex import gettext as _
 
 from flaskbb import __version__ as flaskbb_version
 from flaskbb._compat import iteritems

flaskbb/plugins/__init__.py

@@ -1,5 +1,5 @@
-from flask.ext.plugins import Plugin
 from flask import current_app
+from flask_plugins import Plugin
 
 from flaskbb.management.models import SettingsGroup
 

flaskbb/plugins/portal/views.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from flask import Blueprint, current_app, flash, request
-from flask.ext.babelex import gettext as _
+from flask_babelex import gettext as _
 
 from flaskbb.utils.helpers import render_template
 from flaskbb.forum.models import Topic, Post

flaskbb/user/forms.py

@@ -8,13 +8,13 @@
     :copyright: (c) 2014 by the FlaskBB Team.
     :license: BSD, see LICENSE for more details.
 """
-from flask.ext.login import current_user
-from flask.ext.wtf import Form
+from flask_login import current_user
+from flask_wtf import Form
 from wtforms import (StringField, PasswordField, DateField, TextAreaField,
                      SelectField, ValidationError, SubmitField)
 from wtforms.validators import (Length, DataRequired, InputRequired, Email,
                                 EqualTo, regexp, Optional, URL)
-from flask.ext.babelex import lazy_gettext as _
+from flask_babelex import lazy_gettext as _
 
 from flaskbb.user.models import User, PrivateMessage
 from flaskbb.extensions import db

flaskbb/user/models.py

@@ -14,7 +14,8 @@
 from itsdangerous import SignatureExpired
 from werkzeug.security import generate_password_hash, check_password_hash
 from flask import current_app, url_for
-from flask.ext.login import UserMixin, AnonymousUserMixin
+from flask_login import UserMixin, AnonymousUserMixin
+
 from flaskbb._compat import max_integer
 from flaskbb.extensions import db, cache
 from flaskbb.utils.settings import flaskbb_config

flaskbb/user/views.py

@@ -12,9 +12,9 @@
 from datetime import datetime
 
 from flask import Blueprint, flash, request, redirect, url_for
-from flask.ext.login import login_required, current_user
-from flask.ext.themes2 import get_themes_list
-from flask.ext.babelex import gettext as _
+from flask_login import login_required, current_user
+from flask_themes2 import get_themes_list
+from flask_babelex import gettext as _
 
 from flaskbb.extensions import db, babel
 from flaskbb.utils.helpers import render_template

flaskbb/utils/decorators.py

@@ -11,7 +11,7 @@
 from functools import wraps
 
 from flask import abort
-from flask.ext.login import current_user
+from flask_login import current_user
 
 
 def admin_required(f):

flaskbb/utils/helpers.py

@@ -15,14 +15,13 @@
 from datetime import datetime, timedelta
 
 from flask import session, url_for
-from flask.ext.themes2 import render_theme_template
-from flask.ext.login import current_user
-
+from flask_themes2 import render_theme_template
+from flask_login import current_user
 from postmarkup import render_bbcode
 from markdown2 import markdown as render_markdown
 import unidecode
-from flaskbb._compat import range_method, text_type
 
+from flaskbb._compat import range_method, text_type
 from flaskbb.extensions import redis_store
 from flaskbb.utils.settings import flaskbb_config
 

flaskbb/utils/translations.py

@@ -1,9 +1,8 @@
 import os
 
 import babel
-
-from flask.ext.babelex import Domain, get_locale
-from flask.ext.plugins import get_plugins_list
+from flask_babelex import Domain, get_locale
+from flask_plugins import get_plugins_list
 
 
 class FlaskBBDomain(Domain):

manage.py

@@ -24,9 +24,9 @@
 from flask import current_app
 from werkzeug.utils import import_string
 from sqlalchemy.exc import IntegrityError, OperationalError
-from flask.ext.script import (Manager, Shell, Server, prompt, prompt_pass,
-                              prompt_bool)
-from flask.ext.migrate import MigrateCommand
+from flask_script import (Manager, Shell, Server, prompt, prompt_pass,
+                          prompt_bool)
+from flask_migrate import MigrateCommand
 
 from flaskbb import create_app
 from flaskbb.extensions import db

tests/unit/test_forum_models.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 
 from flask import current_app
-from flask.ext.login import login_user, current_user, logout_user
+from flask_login import login_user, current_user, logout_user
 
 from flaskbb.forum.models import Category, Forum, Topic, Post, ForumsRead, \
     TopicsRead, Report

tests/unit/utils/test_helpers.py

@@ -1,5 +1,5 @@
 #-*- coding: utf-8 -*-
-from flask.ext.login import login_user
+from flask_login import login_user
 from flaskbb.utils.helpers import slugify, forum_is_unread