Commits

Senthil Kumaran committed c950fac

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

Comments (0)

Files changed (2)

Lib/test/test_urllib2.py

         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/",
     # 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):