From 4649299dc3a00911b835abed1bde60a7dd3ac140 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Wed, 24 Feb 2010 20:58:58 +0000 Subject: [PATCH] Merged revisions 78431 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78431 | senthil.kumaran | 2010-02-25 02:25:31 +0530 (Thu, 25 Feb 2010) | 4 lines Fix for Issue7540 ; urllib2 will raise a TypeError when you try to add_data to a existing req object already having data. ........ --- Lib/test/test_urllib2.py | 1 + Lib/urllib2.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index c911c9d2c07..4ea6b262290 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -1209,6 +1209,7 @@ class RequestTests(unittest.TestCase): self.get.add_data("spam") self.assert_(self.get.has_data()) self.assertEqual("POST", self.get.get_method()) + self.assertRaises(TypeError,self.get.add_data, "more spam") def test_get_full_url(self): self.assertEqual("http://www.python.org/~jeremy/", diff --git a/Lib/urllib2.py b/Lib/urllib2.py index b416913f492..93722691151 100644 --- a/Lib/urllib2.py +++ b/Lib/urllib2.py @@ -226,6 +226,9 @@ class Request: # XXX these helper methods are lame def add_data(self, data): + if self.has_data(): + raise TypeError("Request Obj already contains data: %s" % + self.data) self.data = data def has_data(self):