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

FormRequest: fix case-insensitive type attributes

This commit is contained in:
Νικόλαος-Διγενής Καραγιάννης 2015-11-13 17:57:46 +02:00
parent 881bf19e68
commit 650acad2b7
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,8 +107,13 @@ def _get_inputs(form, formdata, dont_click, clickdata, response):
inputs = form.xpath('descendant::textarea'
'|descendant::select'
'|descendant::input[@type!="submit" and @type!="image" and @type!="reset"'
'and ((@type!="checkbox" and @type!="radio") or @checked)]')
'|descendant::input[@type['
' translate(., "SUBMIT", "submit") != "submit"'
' and translate(., "IMAGE", "image") !="image"'
' and translate(., "RESET", "reset") != "reset"'
' and (../@checked or ('
' translate(., "CHECKBOX", "checkbox") != "checkbox"'
' and translate(., "RADIO", "radio") != "radio"))]]')
values = [(k, u'' if v is None else v)
for k, v in (_value(e) for e in inputs)
if k and k not in formdata]
@ -151,9 +156,11 @@ def _get_clickable(clickdata, form):
if the latter is given. If not, it returns the first
clickable element found
"""
clickables = [el for el in form.xpath('descendant::input[@type="submit"]'
'|descendant::button[@type="submit"]'
'|descendant::button[not(@type)]')]
clickables = [
el for el in form.xpath(
'descendant::*[(self::input or self::button)'
' and translate(@type, "SUBMIT", "submit") = "submit"]'
'|descendant::button[not(@type)]')]
if not clickables:
return