Fix issue9301 - handle unquote({}) kind of case.
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 44574c9..23492fb 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -527,6 +527,7 @@
self.assertEqual(expect, result,
"using quote_plus(): %r != %r" % (expect, result))
+
class UnquotingTests(unittest.TestCase):
"""Tests for unquote() and unquote_plus()
@@ -555,6 +556,7 @@
"using unquote(): not all characters escaped: "
"%s" % result)
self.assertRaises(TypeError, urllib.parse.unquote, None)
+ self.assertRaises(TypeError, urllib.parse.unquote, ())
def test_unquoting_badpercent(self):
# Test unquoting on bad percent-escapes
@@ -589,8 +591,8 @@
result = urllib.parse.unquote_to_bytes(given)
self.assertEqual(expect, result, "using unquote_to_bytes(): %r != %r"
% (expect, result))
-
self.assertRaises(TypeError, urllib.parse.unquote_to_bytes, None)
+ self.assertRaises(TypeError, urllib.parse.unquote_to_bytes, ())
def test_unquoting_mixed_case(self):
# Test unquoting on mixed-case hex digits in the percent-escapes
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index 691c004..a9fa26a 100644
--- a/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@ -313,9 +313,7 @@
"""unquote_to_bytes('abc%20def') -> b'abc def'."""
# Note: strings are encoded as UTF-8. This is only an issue if it contains
# unescaped non-ASCII characters, which URIs should not.
- if not string:
- if string is None:
- raise TypeError('None object is invalid for unquote_to_bytes()')
+ if string in (b'', ''):
return b''
if isinstance(string, str):
string = string.encode('utf-8')
@@ -340,9 +338,7 @@
unquote('abc%20def') -> 'abc def'.
"""
- if not string:
- if string is None:
- raise TypeError('None object is invalid for unquote() function.')
+ if string in (b'', ''):
return string
res = string.split('%')
if len(res) == 1: