Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
  ........
................
This commit is contained in:
Senthil Kumaran 2010-02-24 21:04:55 +00:00
parent 40ea650b46
commit 73ad434945
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/test/test_urllib2.py
View File

@ -1220,6 +1220,7 @@ class RequestTests(unittest.TestCase):
self.get.add_data("spam") self.get.add_data("spam")
self.assertTrue(self.get.has_data()) self.assertTrue(self.get.has_data())
self.assertEqual("POST", self.get.get_method()) self.assertEqual("POST", self.get.get_method())
self.assertRaises(TypeError,self.get.add_data, "more spam")
def test_get_full_url(self): def test_get_full_url(self):
self.assertEqual("http://www.python.org/~jeremy/", self.assertEqual("http://www.python.org/~jeremy/",

3
Lib/urllib/request.py
View File

@ -192,6 +192,9 @@ class Request:
# Begin deprecated methods # Begin deprecated methods
def add_data(self, data): def add_data(self, data):
if self.has_data():
raise TypeError("Request Obj already contains data: %s" %
self.data)
self.data = data self.data = data
def has_data(self): def has_data(self):