From: Senthil Kumaran <orsenthil@gmail.com>
Date: Wed, 24 Feb 2010 21:04:55 +0000 (+0000)
Subject: Merged revisions 78433 via svnmerge from
X-Git-Tag: v3.1.2rc1~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73ad434945f520337f55f23695221d766d066969;p=python

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 f0297a5537..3e0a107da1 100644
--- 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 d1d12e6569..47fe75e7cf 100644
--- 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):