Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Doc/deprecations/pending-removal-in-3.19.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,12 @@ Pending removal in Python 3.19
supported depending on the backend implementation of hash functions.
Prefer passing the initial data as a positional argument for maximum
backwards compatibility.

* :mod:`http.cookies`:

* :meth:`http.cookies.Morsel.js_output` is deprecated and will be
removed in Python 3.19.

* :meth:`http.cookies.BaseCookie.js_output` is deprecated and will be
removed in Python 3.19.

12 changes: 12 additions & 0 deletions Doc/library/http.cookies.rst
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ Cookie Objects

The meaning for *attrs* is the same as in :meth:`output`.

.. deprecated-removed:: 3.15 3.19
This method generates a JavaScript snippet to set cookies in the browser,
which is no longer considered a standard or recommended approach.
Use :meth:`~http.cookies.BaseCookie.output` instead to generate HTTP
headers.


.. method:: BaseCookie.load(rawdata)

Expand Down Expand Up @@ -225,6 +231,12 @@ Morsel Objects

The meaning for *attrs* is the same as in :meth:`output`.

.. deprecated-removed:: 3.15 3.19
This method generates a JavaScript snippet to set cookies in the browser,
which is no longer considered a standard or recommended approach.
Use :meth:`~http.cookies.Morsel.output` instead to generate HTTP
headers.


.. method:: Morsel.OutputString(attrs=None)

Expand Down
10 changes: 10 additions & 0 deletions Doc/whatsnew/3.15.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1797,6 +1797,16 @@ New deprecations
(Contributed by Bénédikt Tran in :gh:`134978`.)


* :mod:`http.cookies`:

* :meth:`Morsel.js_output <http.cookies.Morsel.js_output>` and
:meth:`BaseCookie.js_output <http.cookies.BaseCookie.js_output>` are
deprecated and will be removed in Python 3.19. Use
:meth:`Morsel.output <http.cookies.Morsel.output>` or
:meth:`BaseCookie.output <http.cookies.BaseCookie.output>` instead.
(Contributed by kishorhange111 in :gh:`148849`.)


* :mod:`re`:

* :func:`re.match` and :meth:`re.Pattern.match` are now
Expand Down
20 changes: 18 additions & 2 deletions Lib/http/cookies.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@
import re
import string
import types
lazy import warnings

__all__ = ["CookieError", "BaseCookie", "SimpleCookie"]

Expand Down Expand Up @@ -390,7 +391,9 @@ def output(self, attrs=None, header="Set-Cookie:"):
def __repr__(self):
return '<%s: %s>' % (self.__class__.__name__, self.OutputString())

def js_output(self, attrs=None):

def _js_output(self, attrs=None):
"""Internal implementation without deprecation warning."""
import base64
# Print javascript
output_string = self.OutputString(attrs)
Expand All @@ -407,6 +410,14 @@ def js_output(self, attrs=None):
</script>
""" % (output_encoded,)

def js_output(self, attrs=None):
warnings._deprecated(
"http.cookies.Morsel.js_output",
message=warnings._DEPRECATED_MSG + "; use output() instead",
remove=(3, 19),
)
return self._js_output(attrs)

def OutputString(self, attrs=None):
# Build up our result
#
Expand Down Expand Up @@ -541,10 +552,15 @@ def __repr__(self):

def js_output(self, attrs=None):
"""Return a string suitable for JavaScript."""
warnings._deprecated(
"http.cookies.BaseCookie.js_output",
message=warnings._DEPRECATED_MSG + "; use output() instead",
remove=(3, 19),
)
result = []
items = sorted(self.items())
for key, value in items:
result.append(value.js_output(attrs))
result.append(value._js_output(attrs))
return _nulljoin(result)

def load(self, rawdata):
Expand Down
41 changes: 34 additions & 7 deletions Lib/test/test_http_cookies.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,17 @@ def test_load(self):
self.assertEqual(C.output(['path']),
'Set-Cookie: Customer="WILE_E_COYOTE"; Path=/acme')
cookie_encoded = base64.b64encode(b'Customer="WILE_E_COYOTE"; Path=/acme; Version=1').decode('ascii')
self.assertEqual(C.js_output(), fr"""
with self.assertWarnsRegex(DeprecationWarning, r"BaseCookie\.js_output"):
self.assertEqual(C.js_output(), fr"""
<script type="text/javascript">
<!-- begin hiding
document.cookie = atob("{cookie_encoded}");
// end hiding -->
</script>
""")
cookie_encoded = base64.b64encode(b'Customer="WILE_E_COYOTE"; Path=/acme').decode('ascii')
self.assertEqual(C.js_output(['path']), fr"""
with self.assertWarnsRegex(DeprecationWarning, r"BaseCookie\.js_output"):
self.assertEqual(C.js_output(['path']), fr"""
<script type="text/javascript">
<!-- begin hiding
document.cookie = atob("{cookie_encoded}");
Expand Down Expand Up @@ -293,15 +295,17 @@ def test_quoted_meta(self):
self.assertEqual(C.output(['path']),
'Set-Cookie: Customer="WILE_E_COYOTE"; Path=/acme')
expected_encoded_cookie = base64.b64encode(b'Customer=\"WILE_E_COYOTE\"; Path=/acme; Version=1').decode('ascii')
self.assertEqual(C.js_output(), fr"""
with self.assertWarnsRegex(DeprecationWarning, r"BaseCookie\.js_output"):
self.assertEqual(C.js_output(), fr"""
<script type="text/javascript">
<!-- begin hiding
document.cookie = atob("{expected_encoded_cookie}");
// end hiding -->
</script>
""")
expected_encoded_cookie = base64.b64encode(b'Customer=\"WILE_E_COYOTE\"; Path=/acme').decode('ascii')
self.assertEqual(C.js_output(['path']), fr"""
with self.assertWarnsRegex(DeprecationWarning, r"BaseCookie\.js_output"):
self.assertEqual(C.js_output(['path']), fr"""
<script type="text/javascript">
<!-- begin hiding
document.cookie = atob("{expected_encoded_cookie}");
Expand Down Expand Up @@ -405,7 +409,8 @@ def test_setter(self):
// end hiding -->
</script>
""" % (expected_encoded_cookie,)
self.assertEqual(M.js_output(), expected_js_output)
with self.assertWarnsRegex(DeprecationWarning, r"Morsel\.js_output"):
self.assertEqual(M.js_output(), expected_js_output)
for i in ["foo bar", "foo@bar"]:
# Try some illegal characters
self.assertRaises(cookies.CookieError,
Expand Down Expand Up @@ -673,16 +678,38 @@ def test_control_characters_output(self):
cookie = cookies.SimpleCookie()
cookie["cookie"] = morsel
with self.assertRaises(cookies.CookieError):
cookie.js_output()
with self.assertWarnsRegex(DeprecationWarning, r"Morsel\.js_output"):
cookie.js_output()

morsel = cookies.Morsel()
morsel.set("key", "value", "coded-value")
morsel._coded_value = c0 # Override private variable.
cookie = cookies.SimpleCookie()
cookie["cookie"] = morsel
with self.assertRaises(cookies.CookieError):
cookie.js_output()
with self.assertWarnsRegex(DeprecationWarning, r"Morsel\.js_output"):
cookie.js_output()

def test_morsel_js_output_deprecated(self):
morsel = cookies.Morsel()
morsel.set("key", "value", "value")
with self.assertWarnsRegex(DeprecationWarning, r"Morsel\.js_output") as cm:
result = morsel.js_output()
self.assertEqual(cm.filename, __file__)
self.assertIn("document.cookie", result)


def test_basecookie_js_output_warns_once(self):
C = cookies.SimpleCookie()
C["key"] = "value"
with self.assertWarns(DeprecationWarning) as cm:
C.js_output()
deprecation_warnings = [
w for w in cm.warnings if issubclass(w.category, DeprecationWarning)
]
self.assertEqual(len(deprecation_warnings), 1)
self.assertRegex(str(deprecation_warnings[0].message), r"BaseCookie\.js_output")
self.assertEqual(cm.filename, __file__)

def load_tests(loader, tests, pattern):
tests.addTest(doctest.DocTestSuite(cookies))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Deprecate :meth:`http.cookies.Morsel.js_output` and
:meth:`http.cookies.BaseCookie.js_output`, which will be removed in
Python 3.19. Use :meth:`http.cookies.Morsel.output` or
:meth:`http.cookies.BaseCookie.output` instead.
Loading