Removing deprecated refs to flask.ext.* (#566)

caravel/__init__.py

@@ -9,10 +9,10 @@ import os
 from logging.handlers import TimedRotatingFileHandler
 
 from flask import Flask, redirect
-from flask.ext.appbuilder import SQLA, AppBuilder, IndexView
-from flask.ext.appbuilder.baseviews import expose
-from flask.ext.cache import Cache
-from flask.ext.migrate import Migrate
+from flask_appbuilder import SQLA, AppBuilder, IndexView
+from flask_appbuilder.baseviews import expose
+from flask_cache import Cache
+from flask_migrate import Migrate
 
 from caravel import version
 
@@ -47,7 +47,7 @@ if app.config.get('ENABLE_TIME_ROTATE'):
     logging.getLogger().addHandler(handler)
 
 if app.config.get('ENABLE_CORS'):
-    from flask.ext.cors import CORS
+    from flask_cors import CORS
     CORS(app, **app.config.get('CORS_OPTIONS'))
 
 

caravel/models.py

@@ -20,10 +20,10 @@ import sqlparse
 from dateutil.parser import parse
 
 from flask import request, g
-from flask.ext.appbuilder import Model
-from flask.ext.appbuilder.models.mixins import AuditMixin
-from flask.ext.appbuilder.models.decorators import renders
-from flask.ext.babelpkg import gettext as _
+from flask_appbuilder import Model
+from flask_appbuilder.models.mixins import AuditMixin
+from flask_appbuilder.models.decorators import renders
+from flask_babelpkg import gettext as _
 
 from pydruid.client import PyDruid
 from pydruid.utils.filters import Dimension, Filter

caravel/views.py

@@ -16,12 +16,12 @@ import sqlalchemy as sqla
 
 from flask import (
     g, request, redirect, flash, Response, render_template, Markup)
-from flask.ext.appbuilder import ModelView, CompactCRUDMixin, BaseView, expose
-from flask.ext.appbuilder.actions import action
-from flask.ext.appbuilder.models.sqla.interface import SQLAInterface
-from flask.ext.appbuilder.security.decorators import has_access
-from flask.ext.babelpkg import gettext as __
-from flask.ext.babelpkg import lazy_gettext as _
+from flask_appbuilder import ModelView, CompactCRUDMixin, BaseView, expose
+from flask_appbuilder.actions import action
+from flask_appbuilder.models.sqla.interface import SQLAInterface
+from flask_appbuilder.security.decorators import has_access
+from flask_babelpkg import gettext as __
+from flask_babelpkg import lazy_gettext as _
 from flask_appbuilder.models.sqla.filters import BaseFilter
 
 from sqlalchemy import create_engine, select, text

caravel/viz.py

@@ -17,8 +17,8 @@ from collections import OrderedDict, defaultdict
 from datetime import datetime, timedelta
 import pandas as pd
 import numpy as np
-from flask import request, Markup
-from flask.ext.babelpkg import lazy_gettext as _
+from flask import request
+from flask_babelpkg import lazy_gettext as _
 from markdown import markdown
 from pandas.io.json import dumps
 from six import string_types