Fix deprecations
This commit is contained in:
parent
e4b27f34f1
commit
6abd9614ab
9 changed files with 16 additions and 13 deletions
|
@ -1,6 +1,6 @@
|
||||||
from flask.ext.admin import Admin
|
from flask_admin import Admin
|
||||||
from flask.ext.admin.contrib.sqla import ModelView
|
from flask_admin.contrib.sqla import ModelView
|
||||||
from flask.ext import login
|
import flask_login as login
|
||||||
|
|
||||||
|
|
||||||
from app import app, db
|
from app import app, db
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
import logging
|
import logging
|
||||||
from logging.handlers import TimedRotatingFileHandler
|
from logging.handlers import TimedRotatingFileHandler
|
||||||
from flask import Flask
|
from flask import Flask
|
||||||
from flask.ext.bootstrap import Bootstrap, StaticCDN
|
from flask_bootstrap import Bootstrap, StaticCDN
|
||||||
from flask.ext.sqlalchemy import SQLAlchemy
|
from flask_sqlalchemy import SQLAlchemy
|
||||||
from flask_debugtoolbar import DebugToolbarExtension
|
from flask_debugtoolbar import DebugToolbarExtension
|
||||||
|
|
||||||
from airbrake import Airbrake, AirbrakeHandler
|
from airbrake import Airbrake, AirbrakeHandler
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
class Configuration(object):
|
class Configuration(object):
|
||||||
SQLALCHEMY_DATABASE_URI = 'sqlite:///haldis.db'
|
SQLALCHEMY_DATABASE_URI = 'sqlite:///haldis.db'
|
||||||
|
SQLALCHEMY_TRACK_MODIFICATIONS = False
|
||||||
DEBUG = True
|
DEBUG = True
|
||||||
SECRET_KEY = '<change>'
|
SECRET_KEY = '<change>'
|
||||||
SLACK_WEBHOOK = '<add url>'
|
SLACK_WEBHOOK = '<add url>'
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
from flask import session
|
from flask import session
|
||||||
from flask.ext.login import current_user
|
from flask_login import current_user
|
||||||
from flask_wtf import Form
|
from flask_wtf import FlaskForm as Form
|
||||||
from wtforms import SelectField, DateTimeField, validators, SubmitField, StringField
|
from wtforms import SelectField, DateTimeField, validators, SubmitField, StringField
|
||||||
|
|
||||||
|
|
||||||
from models import User, Location
|
from models import User, Location
|
||||||
from utils import euro
|
from utils import euro
|
||||||
|
|
||||||
|
|
|
@ -8,8 +8,8 @@ from models import *
|
||||||
from forms import *
|
from forms import *
|
||||||
from utils import *
|
from utils import *
|
||||||
from views import *
|
from views import *
|
||||||
from flask.ext.migrate import Migrate, MigrateCommand
|
from flask_migrate import Migrate, MigrateCommand
|
||||||
from flask.ext.script import Manager
|
from flask_script import Manager
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
# do it here, because make accessing db changes only possible when executing the program directly
|
# do it here, because make accessing db changes only possible when executing the program directly
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
from flask import redirect, abort, session, url_for
|
from flask import redirect, abort, session, url_for
|
||||||
from flask.ext.login import LoginManager, current_user, logout_user
|
from flask_login import LoginManager, current_user, logout_user
|
||||||
|
|
||||||
|
|
||||||
from app import app
|
from app import app
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
|
|
||||||
from flask import url_for, render_template, abort
|
from flask import url_for, render_template, abort
|
||||||
from flask.ext.login import login_required
|
from flask_login import login_required
|
||||||
|
|
||||||
from app import app
|
from app import app
|
||||||
from models import Order, Location
|
from models import Order, Location
|
||||||
|
|
|
@ -3,7 +3,7 @@ import json
|
||||||
from threading import Thread
|
from threading import Thread
|
||||||
import requests
|
import requests
|
||||||
from flask import url_for, render_template, abort, redirect, Blueprint, flash, session, request
|
from flask import url_for, render_template, abort, redirect, Blueprint, flash, session, request
|
||||||
from flask.ext.login import current_user, login_required
|
from flask_login import current_user, login_required
|
||||||
import random
|
import random
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
from flask import redirect, url_for, session, jsonify, flash, request
|
from flask import redirect, url_for, session, jsonify, flash, request
|
||||||
from flask.ext.login import login_user
|
from flask_login import login_user
|
||||||
from flask_oauthlib.client import OAuth, OAuthException
|
from flask_oauthlib.client import OAuth, OAuthException
|
||||||
import json
|
import json
|
||||||
import requests
|
import requests
|
||||||
|
|
Loading…
Reference in a new issue