summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Post <cent@spline.de>2020-08-07 18:30:48 +0200
committerJonah BrĂ¼chert <jbb@kaidan.im>2023-05-22 00:28:12 +0200
commit12c8e9a16c5cf0addcf8e8f8cce76aac110c16dd (patch)
tree55020b4d04a9aa43627265767e344e10dc02617c
parent4015a8c085ddb9ee04fa37316f15d16229ca7f95 (diff)
downloadweb-12c8e9a16c5cf0addcf8e8f8cce76aac110c16dd.tar.gz
web-12c8e9a16c5cf0addcf8e8f8cce76aac110c16dd.tar.bz2
web-12c8e9a16c5cf0addcf8e8f8cce76aac110c16dd.zip
pushed flask to 0.11
-rw-r--r--accounts/forms.py4
-rw-r--r--accounts/models.py2
-rw-r--r--accounts/utils/console.py2
-rw-r--r--accounts/utils/login.py2
-rw-r--r--accounts/views/admin/__init__.py2
-rw-r--r--accounts/views/default/__init__.py2
-rw-r--r--accounts/views/login/__init__.py2
-rw-r--r--accounts/views/login/forms.py2
-rw-r--r--requirements.txt2
9 files changed, 10 insertions, 10 deletions
diff --git a/accounts/forms.py b/accounts/forms.py
index b3cc425..245d0f0 100644
--- a/accounts/forms.py
+++ b/accounts/forms.py
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
import re
from flask import current_app, Markup, url_for
-from flask.ext.wtf import Form
-from flask.ext.login import current_user
+from flask_wtf import Form
+from flask_login import current_user
from wtforms import TextField, PasswordField, ValidationError, BooleanField,\
validators
from wtforms.form import FormMeta
diff --git a/accounts/models.py b/accounts/models.py
index 45648a4..848a4cd 100644
--- a/accounts/models.py
+++ b/accounts/models.py
@@ -1,4 +1,4 @@
-from flask.ext.login import UserMixin
+from flask_login import UserMixin
from accounts.utils.login import create_userid
diff --git a/accounts/utils/console.py b/accounts/utils/console.py
index 841a78a..eddc25e 100644
--- a/accounts/utils/console.py
+++ b/accounts/utils/console.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-from flask.ext import script
+import flask_script as script
class Command(script.Command):
diff --git a/accounts/utils/login.py b/accounts/utils/login.py
index 71b4f59..4267827 100644
--- a/accounts/utils/login.py
+++ b/accounts/utils/login.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
from flask import current_app
-from flask.ext.login import LoginManager, current_user
+from flask_login import LoginManager, current_user
from functools import wraps
from werkzeug.exceptions import Forbidden
from itsdangerous import base64_decode, base64_encode, compact_json
diff --git a/accounts/views/admin/__init__.py b/accounts/views/admin/__init__.py
index 0d273d2..66de7c3 100644
--- a/accounts/views/admin/__init__.py
+++ b/accounts/views/admin/__init__.py
@@ -3,7 +3,7 @@
from flask import Blueprint
from flask import current_app, redirect, request, g, flash, url_for
-from flask.ext.login import current_user
+from flask_login import current_user
from uuid import uuid4
from werkzeug.exceptions import Forbidden
diff --git a/accounts/views/default/__init__.py b/accounts/views/default/__init__.py
index a14e113..1854c46 100644
--- a/accounts/views/default/__init__.py
+++ b/accounts/views/default/__init__.py
@@ -5,7 +5,7 @@ from copy import deepcopy
from flask import Blueprint
from flask import current_app, redirect, render_template, request, g, \
flash, url_for
-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 werkzeug.exceptions import Forbidden
from accounts.forms import RegisterForm, RegisterCompleteForm, \
diff --git a/accounts/views/login/__init__.py b/accounts/views/login/__init__.py
index 7371f84..afcc4a9 100644
--- a/accounts/views/login/__init__.py
+++ b/accounts/views/login/__init__.py
@@ -3,7 +3,7 @@
from flask import Blueprint
from flask import current_app, redirect, request, g, flash, render_template, url_for
-from flask.ext.login import login_user, logout_user, current_user
+from flask_login import login_user, logout_user, current_user
from urllib.parse import urljoin, urlparse
from .forms import LoginForm
diff --git a/accounts/views/login/forms.py b/accounts/views/login/forms.py
index 2db25b9..b45ef06 100644
--- a/accounts/views/login/forms.py
+++ b/accounts/views/login/forms.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-from flask.ext.wtf import Form
+from flask_wtf import Form
from wtforms import TextField, PasswordField, validators
diff --git a/requirements.txt b/requirements.txt
index ac77081..5347d68 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Flask==0.10.1 # >=0.10
+Flask==0.11.* # >=0.10
Flask-WTF==0.10.2 # none
Flask-Script==0.6.7 # none
Flask-Login==0.2.6 # none