summaryrefslogtreecommitdiff
path: root/Lib/test/test_urllib.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/test/test_urllib.py')
-rw-r--r--Lib/test/test_urllib.py25
1 files changed, 23 insertions, 2 deletions
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 9a6b5f66b7..3f59c66084 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -1049,8 +1049,6 @@ class UnquotingTests(unittest.TestCase):
"%s" % result)
self.assertRaises((TypeError, AttributeError), urllib.parse.unquote, None)
self.assertRaises((TypeError, AttributeError), urllib.parse.unquote, ())
- with support.check_warnings(('', BytesWarning), quiet=True):
- self.assertRaises((TypeError, AttributeError), urllib.parse.unquote, b'')
def test_unquoting_badpercent(self):
# Test unquoting on bad percent-escapes
@@ -1210,6 +1208,29 @@ class UnquotingTests(unittest.TestCase):
self.assertEqual(expect, result,
"using unquote(): %r != %r" % (expect, result))
+ def test_unquoting_with_bytes_input(self):
+ # ASCII characters decoded to a string
+ given = b'blueberryjam'
+ expect = 'blueberryjam'
+ result = urllib.parse.unquote(given)
+ self.assertEqual(expect, result,
+ "using unquote(): %r != %r" % (expect, result))
+
+ # A mix of non-ASCII hex-encoded characters and ASCII characters
+ given = b'bl\xc3\xa5b\xc3\xa6rsyltet\xc3\xb8y'
+ expect = 'bl\u00e5b\u00e6rsyltet\u00f8y'
+ result = urllib.parse.unquote(given)
+ self.assertEqual(expect, result,
+ "using unquote(): %r != %r" % (expect, result))
+
+ # A mix of non-ASCII percent-encoded characters and ASCII characters
+ given = b'bl%c3%a5b%c3%a6rsyltet%c3%b8j'
+ expect = 'bl\u00e5b\u00e6rsyltet\u00f8j'
+ result = urllib.parse.unquote(given)
+ self.assertEqual(expect, result,
+ "using unquote(): %r != %r" % (expect, result))
+
+
class urlencode_Tests(unittest.TestCase):
"""Tests for urlencode()"""