From c7743aaac3b318c3e4c8583d8b1e5f3be267d119 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Mon, 19 Jul 2010 17:35:50 +0000 Subject: [PATCH] Fix Issue9301 - urllib.quote(None) to raise TypeError --- Lib/test/test_urllib.py | 1 + Lib/urllib.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py index 77fa8f6e87..16febaec44 100644 --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -413,6 +413,7 @@ class QuotingTests(unittest.TestCase): "using quote(): %s != %s" % (expected, result)) self.assertEqual(expected, result, "using quote_plus(): %s != %s" % (expected, result)) + self.assertRaises(TypeError, urllib.quote, None) def test_quoting_space(self): # Make sure quote() and quote_plus() handle spaces as specified in diff --git a/Lib/urllib.py b/Lib/urllib.py index e32a771933..3460a56657 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -1223,6 +1223,8 @@ def quote(s, safe='/', encoding=None, errors=None): """ # fastpath if not s: + if s is None: + raise TypeError('None object cannot be quoted') return s if encoding is not None or isinstance(s, unicode): -- 2.40.0