Mercurial > wikked

changeset 459:6c8f90e47338

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core: Use new import syntax for Flask plugins.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 30 Sep 2018 21:38:44 -0700
parents faa4c8467291
children bca920563cfb
files wikked/api/edit.py wikked/api/history.py wikked/api/read.py wikked/api/special.py wikked/api/user.py wikked/bcryptfallback.py wikked/commonroutes.py wikked/views/__init__.py wikked/views/edit.py wikked/views/history.py wikked/views/read.py wikked/views/special.py wikked/views/user.py wikked/web.py wikked/webimpl/admin.py wikked/webimpl/decorators.py
diffstat 16 files changed, 16 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/wikked/api/edit.py	Wed Jan 10 22:52:42 2018 -0800
+++ b/wikked/api/edit.py	Sun Sep 30 21:38:44 2018 -0700
@@ -1,5 +1,5 @@
 from flask import abort, request, jsonify
-from flask.ext.login import current_user
+from flask_login import current_user
 from wikked.web import app, get_wiki
 from wikked.webimpl import url_from_viewarg, split_url_from_viewarg
 from wikked.webimpl.decorators import requires_permission
--- a/wikked/api/history.py	Wed Jan 10 22:52:42 2018 -0800
+++ b/wikked/api/history.py	Sun Sep 30 21:38:44 2018 -0700
@@ -1,5 +1,5 @@
 from flask import request, abort, jsonify
-from flask.ext.login import current_user
+from flask_login import current_user
 from wikked.web import app, get_wiki
 from wikked.webimpl import url_from_viewarg
 from wikked.webimpl.decorators import requires_permission
--- a/wikked/api/read.py	Wed Jan 10 22:52:42 2018 -0800
+++ b/wikked/api/read.py	Sun Sep 30 21:38:44 2018 -0700
@@ -1,5 +1,5 @@
 from flask import request, jsonify, make_response, abort
-from flask.ext.login import current_user
+from flask_login import current_user
 from wikked.scm.base import STATE_NAMES
 from wikked.utils import PageNotFoundError
 from wikked.web import app, get_wiki
--- a/wikked/api/special.py	Wed Jan 10 22:52:42 2018 -0800
+++ b/wikked/api/special.py	Sun Sep 30 21:38:44 2018 -0700
@@ -1,5 +1,5 @@
 from flask import jsonify, request, abort
-from flask.ext.login import current_user
+from flask_login import current_user
 from wikked.web import app, get_wiki
 from wikked.webimpl.decorators import requires_permission
 from wikked.webimpl.special import (
--- a/wikked/api/user.py	Wed Jan 10 22:52:42 2018 -0800
+++ b/wikked/api/user.py	Sun Sep 30 21:38:44 2018 -0700
@@ -1,5 +1,5 @@
 from flask import jsonify, abort, request
-from flask.ext.login import logout_user, current_user
+from flask_login import logout_user, current_user
 from wikked.web import app, get_wiki
 from wikked.webimpl.admin import do_login_user
 
--- a/wikked/bcryptfallback.py	Wed Jan 10 22:52:42 2018 -0800
+++ b/wikked/bcryptfallback.py	Sun Sep 30 21:38:44 2018 -0700
@@ -3,7 +3,7 @@
 logger = logging.getLogger(__name__)
 
 try:
-    from flask.ext.bcrypt import Bcrypt, generate_password_hash
+    from flask_bcrypt import Bcrypt, generate_password_hash
 except ImportError:
     logger.warning("Bcrypt not available... falling back to SHA512.")
     logger.warning("Run `pip install Flask-Bcrypt` for more secure "
@@ -24,4 +24,3 @@
             self.check_password_hash = check_password_hash
 
     Bcrypt = SHA512Fallback
-
--- a/wikked/commonroutes.py	Wed Jan 10 22:52:42 2018 -0800
+++ b/wikked/commonroutes.py	Sun Sep 30 21:38:44 2018 -0700
@@ -1,6 +1,6 @@
 import os.path
 from flask import request, abort
-from flask.ext.login import current_user
+from flask_login import current_user
 from werkzeug import Response
 from werkzeug.wsgi import wrap_file
 from wikked.web import app, get_wiki
--- a/wikked/views/__init__.py	Wed Jan 10 22:52:42 2018 -0800
+++ b/wikked/views/__init__.py	Sun Sep 30 21:38:44 2018 -0700
@@ -1,6 +1,6 @@
 import urllib.parse
 from flask import request, url_for
-from flask.ext.login import current_user
+from flask_login import current_user
 from wikked.utils import get_url_folder, split_page_url
 from wikked.web import get_wiki
 
--- a/wikked/views/edit.py	Wed Jan 10 22:52:42 2018 -0800
+++ b/wikked/views/edit.py	Sun Sep 30 21:38:44 2018 -0700
@@ -1,5 +1,5 @@
 from flask import abort, redirect, url_for, request, render_template
-from flask.ext.login import current_user
+from flask_login import current_user
 from wikked.views import add_auth_data, add_navigation_data
 from wikked.web import app, get_wiki
 from wikked.webimpl import url_from_viewarg
--- a/wikked/views/history.py	Wed Jan 10 22:52:42 2018 -0800
+++ b/wikked/views/history.py	Sun Sep 30 21:38:44 2018 -0700
@@ -1,6 +1,6 @@
 import urllib.parse
 from flask import request, abort, render_template
-from flask.ext.login import current_user
+from flask_login import current_user
 from wikked.views import add_auth_data, add_navigation_data
 from wikked.web import app, get_wiki
 from wikked.webimpl import url_from_viewarg
--- a/wikked/views/read.py	Wed Jan 10 22:52:42 2018 -0800
+++ b/wikked/views/read.py	Sun Sep 30 21:38:44 2018 -0700
@@ -1,7 +1,7 @@
 import urllib.parse
 from flask import (
     render_template, request, abort)
-from flask.ext.login import current_user
+from flask_login import current_user
 from wikked.utils import split_page_url, PageNotFoundError
 from wikked.views import add_auth_data, add_navigation_data
 from wikked.web import app, get_wiki
--- a/wikked/views/special.py	Wed Jan 10 22:52:42 2018 -0800
+++ b/wikked/views/special.py	Sun Sep 30 21:38:44 2018 -0700
@@ -1,5 +1,5 @@
 from flask import request, redirect, url_for, render_template, abort
-from flask.ext.login import current_user
+from flask_login import current_user
 from wikked.views import add_auth_data, add_navigation_data
 from wikked.web import app, get_wiki
 from wikked.webimpl.decorators import requires_permission
--- a/wikked/views/user.py	Wed Jan 10 22:52:42 2018 -0800
+++ b/wikked/views/user.py	Sun Sep 30 21:38:44 2018 -0700
@@ -1,5 +1,5 @@
 from flask import request, redirect, render_template
-from flask.ext.login import login_user, logout_user, current_user
+from flask_login import login_user, logout_user, current_user
 from wikked.views import add_auth_data, add_navigation_data
 from wikked.web import app, get_wiki
 
--- a/wikked/web.py	Wed Jan 10 22:52:42 2018 -0800
+++ b/wikked/web.py	Sun Sep 30 21:38:44 2018 -0700
@@ -160,7 +160,7 @@
     })
 
 
-from flask.ext.login import LoginManager  # NOQA
+from flask_login import LoginManager  # NOQA
 login_manager = LoginManager()
 login_manager.init_app(app)
 login_manager.user_loader(user_loader)
--- a/wikked/webimpl/admin.py	Wed Jan 10 22:52:42 2018 -0800
+++ b/wikked/webimpl/admin.py	Sun Sep 30 21:38:44 2018 -0700
@@ -1,5 +1,5 @@
 from flask import request
-from flask.ext.login import login_user
+from flask_login import login_user
 from wikked.web import app, get_wiki
 
 
@@ -15,4 +15,3 @@
             login_user(user, remember=bool(remember))
             return True
     return False
-
--- a/wikked/webimpl/decorators.py	Wed Jan 10 22:52:42 2018 -0800
+++ b/wikked/webimpl/decorators.py	Sun Sep 30 21:38:44 2018 -0700
@@ -1,5 +1,5 @@
 import functools
-from flask.ext.login import current_user
+from flask_login import current_user
 from wikked.auth import PERM_NAMES
 from wikked.web import get_wiki
 from wikked.webimpl import UserPermissionError