Fix imports and other deprecation warnings

flaskbb/auth/services/authentication.py

@@ -16,7 +16,7 @@ from pytz import UTC
 
 import attr
 from flask_babelplus import gettext as _
-from werkzeug import check_password_hash
+from werkzeug.security import check_password_hash
 
 from ...core.auth.authentication import (AuthenticationFailureHandler,
                                          AuthenticationManager,

flaskbb/utils/fields.py

@@ -19,10 +19,10 @@ except ImportError:
     from urllib import request as http
 
 from flask import request, current_app, Markup, json
-from werkzeug import url_encode
+from werkzeug.urls import url_encode
 from wtforms import ValidationError
 from wtforms.fields import DateField, Field
-from wtforms.widgets.core import Select, HTMLString, html_params
+from wtforms.widgets.core import Select, html_params
 
 from flaskbb._compat import to_bytes, to_unicode
 from flaskbb.utils.settings import flaskbb_config
@@ -229,7 +229,7 @@ class SelectBirthdayWidget(object):
 
             html.append(' ')
 
-        return HTMLString(''.join(html))
+        return Markup(''.join(html))
 
 
 class BirthdayField(DateField):

tests/unit/auth/test_activation.py

@@ -31,10 +31,11 @@ class TestAccountActivationInitiateActivation(object):
     ):
         service = activation.AccountActivator(token_serializer, User)
         mock = mocker.MagicMock()
-        with mocker.patch(
-                'flaskbb.auth.services.activation.send_activation_token.delay',
-                mock):
-            service.initiate_account_activation(unactivated_user.email)
+        mocker.patch(
+            'flaskbb.auth.services.activation.send_activation_token.delay',
+            mock
+        )
+        service.initiate_account_activation(unactivated_user.email)
 
         token = token_serializer.dumps(
             Token(

tests/unit/auth/test_password.py

@@ -71,9 +71,11 @@ class TestPasswordReset(object):
         service = password.ResetPasswordService(token_serializer, User, [])
         mock = mocker.MagicMock()
 
-        with mocker.patch(
-                'flaskbb.auth.services.password.send_reset_token.delay', mock):
-            service.initiate_password_reset(Fred.email)
+        mocker.patch(
+            'flaskbb.auth.services.password.send_reset_token.delay',
+            mock
+        )
+        service.initiate_password_reset(Fred.email)
 
         token = token_serializer.dumps(
             Token(user_id=Fred.id, operation=TokenActions.RESET_PASSWORD)