From 5d11dedf6ae20c5f74eb7188b9fbca93830218ee Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <cedric@cedricbonhomme.org>
Date: Mon, 30 Sep 2019 14:42:16 +0200
Subject: The import 'werkzeug.generate_password_hash' is deprecated.

---
 src/manager.py                | 2 +-
 src/web/controllers/user.py   | 2 +-
 src/web/models/__init__.py    | 4 +---
 src/web/views/session_mgmt.py | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/manager.py b/src/manager.py
index ea54cb75..9535ac59 100755
--- a/src/manager.py
+++ b/src/manager.py
@@ -4,7 +4,7 @@
 import os
 import logging
 from datetime import datetime
-from werkzeug import generate_password_hash
+from werkzeug.security import generate_password_hash
 from bootstrap import application, db, conf, set_logging
 from flask_script import Manager
 from flask_migrate import Migrate, MigrateCommand
diff --git a/src/web/controllers/user.py b/src/web/controllers/user.py
index 65e01e6f..6ab04d44 100644
--- a/src/web/controllers/user.py
+++ b/src/web/controllers/user.py
@@ -1,5 +1,5 @@
 import logging
-from werkzeug import generate_password_hash, check_password_hash
+from werkzeug.security import generate_password_hash, check_password_hash
 from .abstract import AbstractController
 from web.models import User
 
diff --git a/src/web/models/__init__.py b/src/web/models/__init__.py
index 91a2121e..bfb1368c 100644
--- a/src/web/models/__init__.py
+++ b/src/web/models/__init__.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# newspipe - A Web based news aggregator.
+# Newspipe - A Web based news aggregator.
 # Copyright (C) 2010-2018  Cédric Bonhomme - https://www.cedricbonhomme.org
 #
 # For more information : https://gitlab.com/newspipe/newspipe
@@ -41,8 +41,6 @@ __all__ = ['Feed', 'Role', 'User', 'Article', 'Icon', 'Category',
 
 import os
 
-from werkzeug import generate_password_hash
-
 from sqlalchemy.engine import reflection
 from sqlalchemy.schema import (
         MetaData,
diff --git a/src/web/views/session_mgmt.py b/src/web/views/session_mgmt.py
index 4026e558..0db76115 100644
--- a/src/web/views/session_mgmt.py
+++ b/src/web/views/session_mgmt.py
@@ -2,7 +2,7 @@ import json
 import logging
 
 from datetime import datetime
-from werkzeug import generate_password_hash
+from werkzeug.security import generate_password_hash
 from werkzeug.exceptions import NotFound
 from flask import (render_template, flash, session, request,
                    url_for, redirect, current_app)
-- 
cgit