# HG changeset patch # User Dennis Fink # Date 2017-10-17 16:30:20 # Node ID 87bad59bf19d95c3104dc81282215cd147d7f8fc # Parent 3f9a3bc2f4ee9457a1b3b1408d8ea0c2debe4e86 Updated Flask diff --git a/ennstatus/__init__.py b/ennstatus/__init__.py --- a/ennstatus/__init__.py +++ b/ennstatus/__init__.py @@ -18,16 +18,16 @@ import os.path import json from flask import Flask, render_template -from flask.ext.bootstrap import Bootstrap -from flask.ext.wtf import CsrfProtect -from flask.ext.moment import Moment +from flask_bootstrap import Bootstrap +from flask_wtf import CSRFProtect +from flask_moment import Moment from werkzeug.contrib.fixers import ProxyFix import gnupg bootstrap = Bootstrap() -csrf = CsrfProtect() +csrf = CSRFProtect() moment = Moment() config_file = os.path.abspath('config.json') diff --git a/ennstatus/api/auth.py b/ennstatus/api/auth.py --- a/ennstatus/api/auth.py +++ b/ennstatus/api/auth.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from flask import current_app -from flask.ext.httpauth import HTTPDigestAuth +from flask_httpauth import HTTPDigestAuth httpauth = HTTPDigestAuth() diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -6,24 +6,24 @@ # Babel==2.2.0 blinker==1.4 # via flask-mail -click==6.3 -dominate==2.1.17 # via flask-bootstrap -Flask-Bootstrap==3.3.5.7 -Flask-HTTPAuth==2.7.2 +click==6.7 +dominate==2.3.1 # via flask-bootstrap +Flask-Bootstrap==3.3.7.1 +Flask-HTTPAuth==3.2.3 Flask-Mail==0.9.1 -Flask-Moment==0.5.1 -Flask-WTF==0.12 -Flask==0.10.1 # via flask-bootstrap, flask-httpauth, flask-mail, flask-moment, flask-wtf +Flask-Moment==0.5.2 +Flask-WTF==0.14.2 +Flask==0.12.2 # via flask-bootstrap, flask-httpauth, flask-mail, flask-moment, flask-wtf itsdangerous==0.24 # via flask -Jinja2==2.8 # via flask +Jinja2==2.9.6 # via flask jsonschema==2.5.1 -MarkupSafe==0.23 # via jinja2 +MarkupSafe==1.0 # via jinja2 onionpy==0.3.2 pygeoip==0.3.2 python-gnupg==0.3.8 pytz==2015.7 # via babel requests==2.9.1 # via onionpy strict-rfc3339==0.7 -visitor==0.1.2 # via flask-bootstrap -Werkzeug==0.11.4 # via flask, flask-wtf +visitor==0.1.3 # via flask-bootstrap +Werkzeug==0.12.2 # via flask, flask-wtf WTForms==2.1 # via flask-wtf