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.
........

diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index c911c9d2c074274248402882bfe470d9b4e527c6..4ea6b262290d630757e3fff49e563261720b1934 100644 (file)
--- 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 b416913f49292c274a52009295dc6eced82758a9..93722691151f00d53002aa29482b13380c667d89 100644 (file)
--- 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):