From 9f769fa43a42a914752f42090b68d806343c3f7a Mon Sep 17 00:00:00 2001 From: Steven Loria Date: Tue, 14 Apr 2015 19:55:29 -0400 Subject: [PATCH] Update extension imports to flask_* See mitsuhiko/flask#1135 --- {{cookiecutter.app_name}}/manage.py | 4 ++-- .../{{cookiecutter.app_name}}/assets.py | 2 +- .../{{cookiecutter.app_name}}/extensions.py | 12 ++++++------ .../{{cookiecutter.app_name}}/user/models.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/{{cookiecutter.app_name}}/manage.py b/{{cookiecutter.app_name}}/manage.py index f5cc479..2f2fe20 100644 --- a/{{cookiecutter.app_name}}/manage.py +++ b/{{cookiecutter.app_name}}/manage.py @@ -3,8 +3,8 @@ import os import sys import subprocess -from flask.ext.script import Manager, Shell, Server -from flask.ext.migrate import MigrateCommand +from flask_script import Manager, Shell, Server +from flask_migrate import MigrateCommand from {{cookiecutter.app_name}}.app import create_app from {{cookiecutter.app_name}}.user.models import User diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/assets.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/assets.py index 5f1fb04..b425a85 100644 --- a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/assets.py +++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/assets.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from flask.ext.assets import Bundle, Environment +from flask_assets import Bundle, Environment css = Bundle( "libs/bootstrap/dist/css/bootstrap.css", diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/extensions.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/extensions.py index eff4adb..af8ece3 100644 --- a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/extensions.py +++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/extensions.py @@ -3,20 +3,20 @@ in app.py """ -from flask.ext.bcrypt import Bcrypt +from flask_bcrypt import Bcrypt bcrypt = Bcrypt() -from flask.ext.login import LoginManager +from flask_login import LoginManager login_manager = LoginManager() -from flask.ext.sqlalchemy import SQLAlchemy +from flask_sqlalchemy import SQLAlchemy db = SQLAlchemy() -from flask.ext.migrate import Migrate +from flask_migrate import Migrate migrate = Migrate() -from flask.ext.cache import Cache +from flask_cache import Cache cache = Cache() -from flask.ext.debugtoolbar import DebugToolbarExtension +from flask_debugtoolbar import DebugToolbarExtension debug_toolbar = DebugToolbarExtension() diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/user/models.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/user/models.py index c8481f6..0d9c413 100644 --- a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/user/models.py +++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/user/models.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import datetime as dt -from flask.ext.login import UserMixin +from flask_login import UserMixin from {{cookiecutter.app_name}}.extensions import bcrypt from {{cookiecutter.app_name}}.database import (