From: Senthil Kumaran <orsenthil@gmail.com>
Date: Thu, 4 Mar 2010 15:15:37 +0000 (+0000)
Subject: Reverting the changes made in r78432. Discussed in the tracker issue7540.
X-Git-Tag: v2.6.5rc2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7eda9e9082f9d0efcac61e7df0955f4263b3eea7;p=thirdparty%2FPython%2Fcpython.git

Reverting the changes made in r78432. Discussed in the tracker issue7540.
---

diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 4ea6b262290d..c911c9d2c074 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -1209,7 +1209,6 @@ class RequestTests(unittest.TestCase):
         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/",
diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 93722691151f..b416913f4929 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -226,9 +226,6 @@ class Request:
     # 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):