From a25a641fb479b17e582effa4142f21701a958805 Mon Sep 17 00:00:00 2001 From: vienno Date: Tue, 10 Nov 2015 12:36:36 +0100 Subject: [PATCH 1/5] unnest deep loop --- requests/cookies.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/requests/cookies.py b/requests/cookies.py index 88b478c7..9d9a941d 100644 --- a/requests/cookies.py +++ b/requests/cookies.py @@ -143,10 +143,11 @@ def remove_cookie_by_name(cookiejar, name, domain=None, path=None): """ clearables = [] for cookie in cookiejar: - if cookie.name == name: - if domain is None or domain == cookie.domain: - if path is None or path == cookie.path: - clearables.append((cookie.domain, cookie.path, cookie.name)) + if cookie.name != name: + continue + if domain is None or domain == cookie.domain: + if path is None or path == cookie.path: + clearables.append((cookie.domain, cookie.path, cookie.name)) for domain, path, name in clearables: cookiejar.clear(domain, path, name) From 89178ebcdca2d83f7fa43c766f44f4a60248400f Mon Sep 17 00:00:00 2001 From: vienno Date: Tue, 10 Nov 2015 13:47:40 +0100 Subject: [PATCH 2/5] Complete unnesting of if statements in cookie loop --- requests/cookies.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/requests/cookies.py b/requests/cookies.py index 9d9a941d..df78dfac 100644 --- a/requests/cookies.py +++ b/requests/cookies.py @@ -145,9 +145,11 @@ def remove_cookie_by_name(cookiejar, name, domain=None, path=None): for cookie in cookiejar: if cookie.name != name: continue - if domain is None or domain == cookie.domain: - if path is None or path == cookie.path: - clearables.append((cookie.domain, cookie.path, cookie.name)) + if domain and domain != cookie.domain: + continue + if path and path != cookie.path: + continue + clearables.append((cookie.domain, cookie.path, cookie.name)) for domain, path, name in clearables: cookiejar.clear(domain, path, name) From d849d6e90753cf76425d75fd3cb35631f1a5c5b4 Mon Sep 17 00:00:00 2001 From: vienno Date: Tue, 10 Nov 2015 13:58:09 +0100 Subject: [PATCH 3/5] Replace 'if x' with 'if x is not None' in cookie loop --- requests/cookies.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requests/cookies.py b/requests/cookies.py index df78dfac..d097d7db 100644 --- a/requests/cookies.py +++ b/requests/cookies.py @@ -145,9 +145,9 @@ def remove_cookie_by_name(cookiejar, name, domain=None, path=None): for cookie in cookiejar: if cookie.name != name: continue - if domain and domain != cookie.domain: + if domain is not None and domain != cookie.domain: continue - if path and path != cookie.path: + if path is not None and path != cookie.path: continue clearables.append((cookie.domain, cookie.path, cookie.name)) From cf9da5b52e5e3f97c1d87940f8d19c7c3383dcba Mon Sep 17 00:00:00 2001 From: vienno Date: Tue, 10 Nov 2015 14:05:24 +0100 Subject: [PATCH 4/5] add myself to authors --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index b0594a6b..805a05ef 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -161,3 +161,4 @@ Patches and Suggestions - Colin Dickson (`@colindickson `_) - Smiley Barry (`@smiley `_) - Shagun Sodhani (`@shagunsodhani `_) +- Robin Linderborg (`@robinlinderborg `_) From f835843f876c9757e2bc66bcba0459784a2a595a Mon Sep 17 00:00:00 2001 From: vienno Date: Tue, 10 Nov 2015 14:07:55 +0100 Subject: [PATCH 5/5] error in github bio link --- AUTHORS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS.rst b/AUTHORS.rst index 805a05ef..6a7f889b 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -161,4 +161,4 @@ Patches and Suggestions - Colin Dickson (`@colindickson `_) - Smiley Barry (`@smiley `_) - Shagun Sodhani (`@shagunsodhani `_) -- Robin Linderborg (`@robinlinderborg `_) +- Robin Linderborg (`@vienno `_)