summaryrefslogtreecommitdiffstats
path: root/Lib/urllib2.py
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-02-24 20:58:58 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-02-24 20:58:58 (GMT)
commit4649299dc3a00911b835abed1bde60a7dd3ac140 (patch)
tree87cbc2dfa81a4272d158945cc80f6919fcc94497 /Lib/urllib2.py
parent21704c51bb6e83ff32f751b73fd7cb258a3a307c (diff)
downloadcpython-4649299dc3a00911b835abed1bde60a7dd3ac140.zip
cpython-4649299dc3a00911b835abed1bde60a7dd3ac140.tar.gz
cpython-4649299dc3a00911b835abed1bde60a7dd3ac140.tar.bz2
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. ........
Diffstat (limited to 'Lib/urllib2.py')
-rw-r--r--Lib/urllib2.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index b416913..9372269 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -226,6 +226,9 @@ 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):