gh-148849: Add Morsel._js_output() to avoid multiple warnings

Author: kishorhange111

Lib/http/cookies.py

@@ -391,12 +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):
-        warnings._deprecated(
-            "http.cookies.Morsel.js_output",
-            message=warnings._DEPRECATED_MSG + "; use output() instead",
-            remove=(3, 19),
-        )
+
+    def _js_output(self, attrs=None):
+        """Internal implementation without deprecation warning."""
         import base64
         # Print javascript
         output_string = self.OutputString(attrs)
@@ -413,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
         #
@@ -547,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):

Lib/test/test_http_cookies.py

@@ -176,7 +176,7 @@ 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')
-        with self.assertWarnsRegex(DeprecationWarning, r"Morsel\.js_output"):
+        with self.assertWarnsRegex(DeprecationWarning, r"BaseCookie\.js_output"):
             self.assertEqual(C.js_output(), fr"""
         <script type="text/javascript">
         <!-- begin hiding
@@ -185,7 +185,7 @@ def test_load(self):
         </script>
         """)
         cookie_encoded = base64.b64encode(b'Customer="WILE_E_COYOTE"; Path=/acme').decode('ascii')
-        with self.assertWarnsRegex(DeprecationWarning, r"Morsel\.js_output"):
+        with self.assertWarnsRegex(DeprecationWarning, r"BaseCookie\.js_output"):
             self.assertEqual(C.js_output(['path']), fr"""
         <script type="text/javascript">
         <!-- begin hiding
@@ -295,7 +295,7 @@ 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')
-        with self.assertWarnsRegex(DeprecationWarning, r"Morsel\.js_output"):
+        with self.assertWarnsRegex(DeprecationWarning, r"BaseCookie\.js_output"):
             self.assertEqual(C.js_output(), fr"""
         <script type="text/javascript">
         <!-- begin hiding
@@ -304,7 +304,7 @@ def test_quoted_meta(self):
         </script>
         """)
         expected_encoded_cookie = base64.b64encode(b'Customer=\"WILE_E_COYOTE\"; Path=/acme').decode('ascii')
-        with self.assertWarnsRegex(DeprecationWarning, r"Morsel\.js_output"):
+        with self.assertWarnsRegex(DeprecationWarning, r"BaseCookie\.js_output"):
             self.assertEqual(C.js_output(['path']), fr"""
         <script type="text/javascript">
         <!-- begin hiding
@@ -693,21 +693,23 @@ def test_control_characters_output(self):
     def test_morsel_js_output_deprecated(self):
         morsel = cookies.Morsel()
         morsel.set("key", "value", "value")
-        with self.assertWarnsRegex(DeprecationWarning, r"Morsel\.js_output"):
+        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()
-        # Should only be one warning even though BaseCookie iterates Morsels
         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"Morsel\.js_output")
+        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))