Skip to content

Fix infinite loop in wpull.url.query_to_map #401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix infinite loop in wpull.url.query_to_map #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5cc66b
Fix infinite loop in wpull.url.query_to_map
tsdko Nov 2, 2018
75c3603
Add tests for wpull.url.query_to_map
tsdko Nov 2, 2018
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
2 changes: 1 addition & 1 deletion wpull/url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ def query_to_map(text):
else:
dict_obj[key].append('')

return query_to_map(text)
return dict_obj


@functools.lru_cache()
Expand Down
10 changes: 10 additions & 0 deletions wpull/url_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ def test_url_info_parts(self):
self.assertEqual(81, url_info.port)
self.assertEqual('/%C3%A1sdF%E2%80%8C/ghjK', url_info.path)
self.assertEqual('a=b=c&D', url_info.query)
self.assertEqual({'a': ['b=c'], 'D': ['']}, url_info.query_map)
self.assertEqual('/?', url_info.fragment)
self.assertEqual('utf-8', url_info.encoding)
self.assertEqual(
Expand All @@ -108,6 +109,7 @@ def test_url_info_parts(self):
self.assertEqual(21, url_info.port)
self.assertEqual('/mydocs/', url_info.path)
self.assertFalse(url_info.query)
self.assertEqual({'': ['']}, url_info.query_map)
self.assertFalse(url_info.fragment)
self.assertEqual('utf-8', url_info.encoding)
self.assertEqual(
Expand Down Expand Up @@ -186,6 +188,10 @@ def test_url_info_percent_encode(self):
'blah=%95%B6%8E%9A%89%BB%82%AF',
url_info.query
)
self.assertEqual(
{'blah': ['%95%B6%8E%9A%89%BB%82%AF']},
url_info.query_map
)
self.assertEqual(
'shift_jis',
url_info.encoding
Expand Down Expand Up @@ -389,6 +395,10 @@ def test_url_info_query(self):
'http://example.com/?a=1&b=',
URLInfo.parse('http://example.com?a=1&b=').url
)
self.assertEqual(
{'a': ['b c d%20e-f']},
URLInfo.parse('http://example.com?a=b+c+d%20e-f').query_map
)

def test_url_info_ipv6(self):
self.assertEqual(
Expand Down