CookieManager.delete() no longer deletes all cookies when no argument…

…s are given (#1126)
cobrateam · Jan 18, 2023 · 7968c2a · 7968c2a
1 parent b0d512e
commit 7968c2a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 38 deletions.
diff --git a/splinter/driver/djangoclient.py b/splinter/driver/djangoclient.py
@@ -4,7 +4,6 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-import warnings
 from urllib import parse
 
 from splinter.cookie_manager import CookieManagerAPI
@@ -27,13 +26,6 @@ def delete(self, *cookies):
                     del self.driver.cookies[cookie]
                 except KeyError:
                     pass
-        else:
-            warnings.warn(
-                'Deleting all cookies via CookieManager.delete() with no arguments '
-                'has been deprecated. use CookieManager.delete_all().',
-                FutureWarning,
-            )
-            self.delete_all()
 
     def delete_all(self):
         self.driver.cookies.clear()

diff --git a/splinter/driver/flaskclient.py b/splinter/driver/flaskclient.py
@@ -4,7 +4,6 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-import warnings
 from urllib.parse import parse_qs, urlparse, urlencode, urlunparse
 
 from splinter.cookie_manager import CookieManagerAPI
@@ -28,13 +27,6 @@ def delete(self, *cookies):
                     self.driver.delete_cookie("localhost", cookie)
                 except KeyError:
                     pass
-        else:
-            warnings.warn(
-                'Deleting all cookies via CookieManager.delete() with no arguments '
-                'has been deprecated. use CookieManager.delete_all().',
-                FutureWarning,
-            )
-            self.delete_all()
 
     def delete_all(self):
         self.driver.cookie_jar.clear()

diff --git a/splinter/driver/webdriver/cookie_manager.py b/splinter/driver/webdriver/cookie_manager.py
@@ -3,7 +3,6 @@
 # Copyright 2012 splinter authors. All rights reserved.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
-import warnings
 from urllib.parse import urlparse
 
 from splinter.cookie_manager import CookieManagerAPI
@@ -20,13 +19,6 @@ def delete(self, *cookies):
         if cookies:
             for cookie in cookies:
                 self.driver.delete_cookie(cookie)
-        else:
-            warnings.warn(
-                'Deleting all cookies via CookieManager.delete() with no arguments '
-                'has been deprecated. use CookieManager.delete_all().',
-                FutureWarning,
-            )
-            self.delete_all()
 
     def delete_all(self):
         self.driver.delete_all_cookies()

diff --git a/splinter/driver/zopetestbrowser.py b/splinter/driver/zopetestbrowser.py
@@ -9,7 +9,6 @@
 import mimetypes
 import re
 import time
-import warnings
 
 import lxml.html
 from lxml.cssselect import CSSSelector
@@ -40,13 +39,6 @@ def delete(self, *cookies):
                     del self.driver.cookies[cookie]
                 except KeyError:
                     pass
-        else:
-            warnings.warn(
-                'Deleting all cookies via CookieManager.delete() with no arguments '
-                'has been deprecated. use CookieManager.delete_all().',
-                FutureWarning,
-            )
-            self.delete_all()
 
     def delete_all(self):
         self.driver.cookies.clearAll()

diff --git a/tests/cookies.py b/tests/cookies.py
@@ -38,7 +38,7 @@ def test_create_some_cookies_and_delete_them_all(self):
 
         browser.cookies.add({"whatever": "and ever"})
         browser.cookies.add({"anothercookie": "im bored"})
-        browser.cookies.delete()
+        browser.cookies.delete_all()
 
         assert {} == browser.cookies
 
@@ -49,7 +49,7 @@ def test_create_and_delete_a_cookie(self):
         browser = self.get_new_browser()
         browser.visit(self.EXAMPLE_APP)
 
-        browser.cookies.delete()
+        browser.cookies.delete_all()
         browser.cookies.add({"cookie": "with milk"})
         browser.cookies.delete("cookie")
 
@@ -62,7 +62,7 @@ def test_create_and_delete_many_cookies(self):
         browser = self.get_new_browser()
         browser.visit(self.EXAMPLE_APP)
 
-        browser.cookies.delete()
+        browser.cookies.delete_all()
         browser.cookies.add({"acookie": "cooked"})
         browser.cookies.add({"anothercookie": "uncooked"})
         browser.cookies.add({"notacookie": "halfcooked"})
@@ -76,7 +76,7 @@ def test_try_to_destroy_an_absent_cookie_and_nothing_happens(self):
         browser = self.get_new_browser()
         browser.visit(self.EXAMPLE_APP)
 
-        browser.cookies.delete()
+        browser.cookies.delete_all()
         browser.cookies.add({"foo": "bar"})
         browser.cookies.delete("mwahahahaha")
 
@@ -89,13 +89,13 @@ def test_create_and_get_all_cookies(self):
         browser = self.get_new_browser()
         browser.visit(self.EXAMPLE_APP)
 
-        browser.cookies.delete()
+        browser.cookies.delete_all()
         browser.cookies.add({"taco": "shrimp"})
         browser.cookies.add({"lavar": "burton"})
 
         assert 2 == len(browser.cookies.all())
 
-        browser.cookies.delete()
+        browser.cookies.delete_all()
 
         assert {} == browser.cookies.all()