Merged revisions 78433 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78433 | senthil.kumaran | 2010-02-25 02:33:37 +0530 (Thu, 25 Feb 2010) | 10 lines

  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 f0297a55370f9ff983135b61a04bb7400b17ac99..3e0a107da11041daa29d3fc3d8e1d07aa66dc342 100644 (file)
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -1220,6 +1220,7 @@ class RequestTests(unittest.TestCase):
         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/",

diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index d1d12e65695104448128fb4a8cd1120e52885802..47fe75e7cf15ee6889f543bdb8f1aa43e661d329 100644 (file)
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -192,6 +192,9 @@ class Request:
     # 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):