diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2010-07-31 08:56:55 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2010-07-31 08:56:55 (GMT) |
| commit | c049fca0da0b81b04060d52443af493afa560ee8 (patch) | |
| tree | 6ed83d033f4f76f006d086848126e2526acb151f /Lib | |
| parent | 62069d3ce743c6f5f91ef3700d6bc2cc69172359 (diff) | |
| download | cpython-c049fca0da0b81b04060d52443af493afa560ee8.zip cpython-c049fca0da0b81b04060d52443af493afa560ee8.tar.gz cpython-c049fca0da0b81b04060d52443af493afa560ee8.tar.bz2 | |
Fix an oversight in r83294. unquote() should reject bytes. Issue #9301.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_urllib.py | 1 | ||||
| -rw-r--r-- | Lib/urllib/parse.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py index c68fe54..cea153e 100644 --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -557,6 +557,7 @@ class UnquotingTests(unittest.TestCase): "%s" % result) self.assertRaises((TypeError, AttributeError), urllib.parse.unquote, None) self.assertRaises((TypeError, AttributeError), urllib.parse.unquote, ()) + self.assertRaises((TypeError, AttributeError), urllib.parse.unquote, b'') def test_unquoting_badpercent(self): # Test unquoting on bad percent-escapes diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py index a9fa26a..133b9d9 100644 --- a/Lib/urllib/parse.py +++ b/Lib/urllib/parse.py @@ -338,7 +338,7 @@ def unquote(string, encoding='utf-8', errors='replace'): unquote('abc%20def') -> 'abc def'. """ - if string in (b'', ''): + if string == '': return string res = string.split('%') if len(res) == 1: |