RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure value attribute values are set.

This commit is contained in:
Olaf Dietsche 2015-07-12 13:37:28 +02:00
parent 2c28b53cc0
commit 937277e859
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scrapy/http/request/form.py
View File

@ -159,7 +159,7 @@ def _get_clickable(clickdata, form):
# If we don't have clickdata, we just use the first clickable element
if clickdata is None:
el = clickables[0]
return (el.get('name'), el.get('value'))
return (el.get('name'), el.get('value') or '')
# If clickdata is given, we compare it to the clickable elements to find a
# match. We first look to see if the number is specified in clickdata,
@ -171,7 +171,7 @@ def _get_clickable(clickdata, form):
except IndexError:
pass
else:
return (el.get('name'), el.get('value'))
return (el.get('name'), el.get('value') or '')
# We didn't find it, so now we build an XPath expression out of the other
# arguments, because they can be used as such
@ -179,7 +179,7 @@ def _get_clickable(clickdata, form):
u''.join(u'[@%s="%s"]' % c for c in six.iteritems(clickdata))
el = form.xpath(xpath)
if len(el) == 1:
return (el[0].get('name'), el[0].get('value'))
return (el[0].get('name'), el[0].get('value') or '')
elif len(el) > 1:
raise ValueError("Multiple elements found (%r) matching the criteria "
"in clickdata: %r" % (el, clickdata))