Skip to content

Fix get_base_url for non-ascii urls for Python 3 #44

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

Closed
wants to merge 1 commit into from
Closed

Fix get_base_url for non-ascii urls for Python 3 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions tests/test_html.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,28 @@ def test_tag_name(self):
</html>"""
self.assertEqual(get_base_url(text, baseurl), 'https://example.org')

def test_get_base_url_utf8(self):
baseurl = u'https://example.org'

text = u"""
<html>
<head><title>Dummy</title><base href='http://example.org/snowman\u2368' /></head>
<body>blahablsdfsal&amp;</body>
</html>"""
self.assertEqual(get_base_url(text, baseurl),
'http://example.org/snowman%E2%8D%A8')

def test_get_base_url_latin1(self):
baseurl = u'https://example.org'

text = u"""
<html>
<head><title>Dummy</title><base href='http://example.org/sterling\u00a3' /></head>
<body>blahablsdfsal&amp;</body>
</html>"""
self.assertEqual(get_base_url(text, baseurl, encoding='latin-1'),
'http://example.org/sterling%A3')


class GetMetaRefreshTest(unittest.TestCase):
def test_get_meta_refresh(self):
Expand Down
6 changes: 3 additions & 3 deletions w3lib/html.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,11 @@ def get_base_url(text, baseurl='', encoding='utf-8'):
"""

text = str_to_unicode(text, encoding)
baseurl = unicode_to_str(baseurl, encoding)
m = _baseurl_re.search(text)
if m:
baseurl = moves.urllib.parse.urljoin(baseurl, m.group(1).encode(encoding))
return safe_url_string(baseurl)
baseurl = str_to_unicode(baseurl, encoding)
baseurl = moves.urllib.parse.urljoin(baseurl, m.group(1))
return safe_url_string(unicode_to_str(baseurl, encoding))

def get_meta_refresh(text, baseurl='', encoding='utf-8', ignore_tags=('script', 'noscript')):
"""Return the http-equiv parameter of the HTML meta element from the given
Expand Down