summaryrefslogtreecommitdiffstats
path: root/Lib/urllib
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-02-24 21:03:37 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-02-24 21:03:37 (GMT)
commit6d726c3a2f105b19b44cba0fdd10646a69cafaaa (patch)
treef330380e27459ac1853bbe2227f329a57a78733a /Lib/urllib
parent8b1458b2d8179064e8064d85bc05609bbb9a5d0a (diff)
downloadcpython-6d726c3a2f105b19b44cba0fdd10646a69cafaaa.zip
cpython-6d726c3a2f105b19b44cba0fdd10646a69cafaaa.tar.gz
cpython-6d726c3a2f105b19b44cba0fdd10646a69cafaaa.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/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 b9de479..5bdc103 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):