[Python-checkins] r78433 - in python/branches/py3k: Lib/test/test_urllib2.py Lib/urllib/request.py

[senthil.kumaran]

Author: senthil.kumaran
Date: Wed Feb 24 22:03:37 2010
New Revision: 78433

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_urllib2.py
   python/branches/py3k/Lib/urllib/request.py

Modified: python/branches/py3k/Lib/test/test_urllib2.py
==============================================================================
--- python/branches/py3k/Lib/test/test_urllib2.py	(original)
+++ python/branches/py3k/Lib/test/test_urllib2.py	Wed Feb 24 22:03:37 2010
@@ -1220,6 +1220,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/branches/py3k/Lib/urllib/request.py
==============================================================================
--- python/branches/py3k/Lib/urllib/request.py	(original)
+++ python/branches/py3k/Lib/urllib/request.py	Wed Feb 24 22:03:37 2010
@@ -192,6 +192,9 @@
     # Begin deprecated methods
 
     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):