compatibility update for flask 1.0.1

tosca/__init__.py

@@ -1,8 +1,8 @@
 import os
 from flask import Flask
-from flask.ext.sqlalchemy import SQLAlchemy
-from flask.ext.login import LoginManager
-from flask.ext.debugtoolbar import DebugToolbarExtension
+from flask_sqlalchemy import SQLAlchemy
+from flask_login import LoginManager
+from flask_debugtoolbar import DebugToolbarExtension
 
 
 class ReverseProxied(object):

tosca/lib/forms.py

@@ -1,4 +1,4 @@
-from flask.ext.wtf import Form
+from flask_wtf import Form
 from wtforms import TextField, BooleanField, PasswordField
 from wtforms.validators import Required
 

tosca/services/dataset.py

@@ -1,7 +1,7 @@
 import json
 from requests import HTTPError
 from flask import Blueprint, redirect, abort, request
-from flask.ext.login import login_required
+from flask_login import login_required
 
 from tosca import app
 from tosca.lib.query import query_dataset_url

tosca/services/download.py

@@ -1,6 +1,6 @@
 import os, json, requests, types, re, hashlib, shutil, subprocess
 from flask import jsonify, Blueprint, request, url_for
-from flask.ext.login import login_required
+from flask_login import login_required
 from pprint import pformat
 from urlparse import urlparse
 

tosca/services/kml.py

@@ -1,6 +1,6 @@
 import os, json, requests
 from flask import jsonify, Blueprint, request, url_for, Response
-from flask.ext.login import login_required
+from flask_login import login_required
 from pprint import pformat
 import simplekml
 

tosca/services/query.py

@@ -1,6 +1,6 @@
 import json, requests
 from flask import jsonify, Blueprint, request, Response, render_template, make_response
-from flask.ext.login import login_required
+from flask_login import login_required
 
 from tosca import app
 from tosca.lib.query import query as query_es

tosca/services/user_rules.py

@@ -1,7 +1,7 @@
 import os, json, requests, types, re, time, copy, traceback
 from flask import (jsonify, Blueprint, request, Response, render_template,
 make_response, g, url_for, redirect)
-from flask.ext.login import login_required
+from flask_login import login_required
 from pprint import pformat
 from string import Template
 from urlparse import urljoin

tosca/services/user_tags.py

@@ -1,6 +1,6 @@
 import json, requests, types, re
 from flask import jsonify, Blueprint, request, Response, render_template, make_response
-from flask.ext.login import login_required
+from flask_login import login_required
 from pprint import pformat
 
 from tosca import app

tosca/services/wget.py

@@ -1,6 +1,6 @@
 import json, requests, types, re
 from flask import jsonify, Blueprint, request, Response, render_template, make_response
-from flask.ext.login import login_required
+from flask_login import login_required
 from pprint import pformat
 
 from tosca import app

tosca/views/js.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 
 from flask import render_template, Blueprint, Response
-from flask.ext.login import login_required
+from flask_login import login_required
 
 
 mod = Blueprint('views/js', __name__)

tosca/views/main.py

@@ -2,7 +2,7 @@
 import hashlib, simpleldap
 from flask import (render_template, Blueprint, g, redirect, session, request,
 url_for, flash, abort, make_response)
-from flask.ext.login import login_required, login_user, logout_user, current_user
+from flask_login import login_required, login_user, logout_user, current_user
 
 from tosca import app, db, lm
 from tosca.models.user import User