Skip to content

Commit a289b6b

Browse files
author
Hai Hoang Dang
authored
Revert "keon#256 change strip_url_params3 to use OrderedDict to prevent failing test on non deterministic retrieval of dict keys for query string (keon#367)" (keon#368)
This reverts commit 81e7853.
1 parent 81e7853 commit a289b6b

File tree

2 files changed

+18
-20
lines changed

2 files changed

+18
-20
lines changed

algorithms/strings/strip_url_params.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import urllib
1111
import urllib.parse
1212

13-
from collections import OrderedDict
14-
1513
# Here is a very non-pythonic grotesque solution
1614
def strip_url_params1(url, params_to_strip=None):
1715

@@ -39,7 +37,7 @@ def strip_url_params1(url, params_to_strip=None):
3937
string = ''
4038
else:
4139
string += char
42-
dict = OrderedDict()
40+
dict = defaultdict(int)
4341
# logic for checking whether we should add the string to our result
4442
for i in key_value_string:
4543
_token = i.split('=')

tests/test_strings.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -339,23 +339,23 @@ def test_roman_to_int(self):
339339
self.assertEqual(3999, roman_to_int("MMMCMXCIX"))
340340

341341

342-
class TestStripUrlParams(unittest.TestCase):
343-
"""[summary]
344-
Test for the file strip_urls_params.py
345-
346-
Arguments:
347-
unittest {[type]} -- [description]
348-
"""
349-
350-
def test_strip_url_params1(self):
351-
self.assertEqual(strip_url_params1("www.saadbenn.com?a=1&b=2&a=2"), "www.saadbenn.com?a=1&b=2")
352-
self.assertEqual(strip_url_params1("www.saadbenn.com?a=1&b=2", ['b']), "www.saadbenn.com?a=1")
353-
def test_strip_url_params2(self):
354-
self.assertEqual(strip_url_params2("www.saadbenn.com?a=1&b=2&a=2"), "www.saadbenn.com?a=1&b=2")
355-
self.assertEqual(strip_url_params2("www.saadbenn.com?a=1&b=2", ['b']), "www.saadbenn.com?a=1")
356-
def test_strip_url_params3(self):
357-
self.assertEqual(strip_url_params3("www.saadbenn.com?a=1&b=2&a=2"), "www.saadbenn.com?a=1&b=2")
358-
self.assertEqual(strip_url_params3("www.saadbenn.com?a=1&b=2", ['b']), "www.saadbenn.com?a=1")
342+
# class TestStripUrlParams(unittest.TestCase):
343+
# """[summary]
344+
# Test for the file strip_urls_params.py
345+
346+
# Arguments:
347+
# unittest {[type]} -- [description]
348+
# """
349+
350+
# def test_strip_url_params1(self):
351+
# self.assertEqual(strip_url_params1("www.saadbenn.com?a=1&b=2&a=2"), "www.saadbenn.com?a=1&b=2")
352+
# self.assertEqual(strip_url_params1("www.saadbenn.com?a=1&b=2", ['b']), "www.saadbenn.com?a=1")
353+
# def test_strip_url_params2(self):
354+
# self.assertEqual(strip_url_params2("www.saadbenn.com?a=1&b=2&a=2"), "www.saadbenn.com?a=1&b=2")
355+
# self.assertEqual(strip_url_params2("www.saadbenn.com?a=1&b=2", ['b']), "www.saadbenn.com?a=1")
356+
# def test_strip_url_params3(self):
357+
# self.assertEqual(strip_url_params3("www.saadbenn.com?a=1&b=2&a=2"), "www.saadbenn.com?a=1&b=2")
358+
# self.assertEqual(strip_url_params3("www.saadbenn.com?a=1&b=2", ['b']), "www.saadbenn.com?a=1")
359359

360360

361361
class TestValidateCoordinates(unittest.TestCase):

0 commit comments

Comments
 (0)