From 4024a4a89c18a1048b7496cf223c0b8c1e63c485 Mon Sep 17 00:00:00 2001 From: David Lord Date: Fri, 3 Apr 2020 10:02:40 -0700 Subject: [PATCH] update deprecation versions --- src/flask/app.py | 25 +++++++++++++------------ src/flask/testing.py | 10 +++++----- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/flask/app.py b/src/flask/app.py index 2f9110ec..e385899e 100644 --- a/src/flask/app.py +++ b/src/flask/app.py @@ -1074,16 +1074,16 @@ class Flask(_PackageBoundObject): we recommend replacing the :class:`session_interface`. .. deprecated: 1.0 - Will be removed in 1.1. Use ``session_interface.open_session`` - instead. + Will be removed in 2.0. Use + ``session_interface.open_session`` instead. :param request: an instance of :attr:`request_class`. """ warnings.warn( DeprecationWarning( - '"open_session" is deprecated and will be removed in 1.1. Use' - ' "session_interface.open_session" instead.' + '"open_session" is deprecated and will be removed in' + ' 2.0. Use "session_interface.open_session" instead.' ) ) return self.session_interface.open_session(self, request) @@ -1094,8 +1094,8 @@ class Flask(_PackageBoundObject): method we recommend replacing the :class:`session_interface`. .. deprecated: 1.0 - Will be removed in 1.1. Use ``session_interface.save_session`` - instead. + Will be removed in 2.0. Use + ``session_interface.save_session`` instead. :param session: the session to be saved (a :class:`~werkzeug.contrib.securecookie.SecureCookie` @@ -1105,8 +1105,8 @@ class Flask(_PackageBoundObject): warnings.warn( DeprecationWarning( - '"save_session" is deprecated and will be removed in 1.1. Use' - ' "session_interface.save_session" instead.' + '"save_session" is deprecated and will be removed in' + ' 2.0. Use "session_interface.save_session" instead.' ) ) return self.session_interface.save_session(self, session, response) @@ -1116,16 +1116,17 @@ class Flask(_PackageBoundObject): this method we recommend replacing the :class:`session_interface`. .. deprecated: 1.0 - Will be removed in 1.1. Use ``session_interface.make_null_session`` - instead. + Will be removed in 2.0. Use + ``session_interface.make_null_session`` instead. .. versionadded:: 0.7 """ warnings.warn( DeprecationWarning( - '"make_null_session" is deprecated and will be removed in 1.1. Use' - ' "session_interface.make_null_session" instead.' + '"make_null_session" is deprecated and will be removed' + ' in 2.0. Use "session_interface.make_null_session"' + " instead." ) ) return self.session_interface.make_null_session(self) diff --git a/src/flask/testing.py b/src/flask/testing.py index b27dfcca..62766a50 100644 --- a/src/flask/testing.py +++ b/src/flask/testing.py @@ -99,14 +99,14 @@ def make_test_environ_builder(*args, **kwargs): """Create a :class:`flask.testing.EnvironBuilder`. .. deprecated: 1.1 - Will be removed in 1.2. Construct ``flask.testing.EnvironBuilder`` - directly instead. + Will be removed in 2.0. Construct + ``flask.testing.EnvironBuilder`` directly instead. """ warnings.warn( DeprecationWarning( - '"make_test_environ_builder()" is deprecated and will be removed ' - 'in 1.2. Construct "flask.testing.EnvironBuilder" directly ' - "instead." + '"make_test_environ_builder()" is deprecated and will be' + ' removed in 2.0. Construct "flask.testing.EnvironBuilder"' + " directly instead." ) ) return EnvironBuilder(*args, **kwargs)