From 650acad2b73c1abafe8ff95808b4d77b65ef67cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=9D=CE=B9=CE=BA=CF=8C=CE=BB=CE=B1=CE=BF=CF=82-=CE=94?= =?UTF-8?q?=CE=B9=CE=B3=CE=B5=CE=BD=CE=AE=CF=82=20=CE=9A=CE=B1=CF=81=CE=B1?= =?UTF-8?q?=CE=B3=CE=B9=CE=AC=CE=BD=CE=BD=CE=B7=CF=82?= Date: Fri, 13 Nov 2015 17:57:46 +0200 Subject: [PATCH] FormRequest: fix case-insensitive type attributes --- scrapy/http/request/form.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/scrapy/http/request/form.py b/scrapy/http/request/form.py index 4a9bd732e..ea4bfd564 100644 --- a/scrapy/http/request/form.py +++ b/scrapy/http/request/form.py @@ -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