[Python-checkins] r78431 - in python/trunk/Lib: test/test_urllib2.py urllib2.py

[senthil.kumaran]

Author: senthil.kumaran
Date: Wed Feb 24 21:55:31 2010
New Revision: 78431

Log:
Fix for Issue7540 ; urllib2 will raise a TypeError when you try to add_data to
a existing req object already having data.



Modified:
   python/trunk/Lib/test/test_urllib2.py
   python/trunk/Lib/urllib2.py

Modified: python/trunk/Lib/test/test_urllib2.py
==============================================================================
--- python/trunk/Lib/test/test_urllib2.py	(original)
+++ python/trunk/Lib/test/test_urllib2.py	Wed Feb 24 21:55:31 2010
@@ -1209,6 +1209,7 @@
         self.get.add_data("spam")
         self.assertTrue(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/",

Modified: python/trunk/Lib/urllib2.py
==============================================================================
--- python/trunk/Lib/urllib2.py	(original)
+++ python/trunk/Lib/urllib2.py	Wed Feb 24 21:55:31 2010
@@ -226,6 +226,9 @@
     # 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):