summaryrefslogtreecommitdiffstats
path: root/Lib/urllib
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-02-24 21:04:55 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-02-24 21:04:55 (GMT)
commit73ad434945f520337f55f23695221d766d066969 (patch)
treeda67ba1160b9d71b1e71ec803b6e4bb4ab3154a3 /Lib/urllib
parent40ea650b46314ca05dbbc22b7971e63b94307ea6 (diff)
downloadcpython-73ad434945f520337f55f23695221d766d066969.zip
cpython-73ad434945f520337f55f23695221d766d066969.tar.gz
cpython-73ad434945f520337f55f23695221d766d066969.tar.bz2
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. ........ ................
Diffstat (limited to 'Lib/urllib')
-rw-r--r--Lib/urllib/request.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index d1d12e6..47fe75e 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):