Skip to content

Repository navigation

Use ASCII case folding for case-insensitive attribute selectors #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jwalith4418-Mj wants to merge 1 commit into from
Closed

Use ASCII case folding for case-insensitive attribute selectors #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cssselect2/compiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ def _compile_node(selector):
value = selector.value
attribute_value = f'el.etree_element.get({key}, "")'
if selector.case_sensitive is False:
value = value.lower()
attribute_value += '.lower()'
value = ascii_lower(value)
attribute_value = f'ascii_lower({attribute_value})'
if selector.operator is None:
return f'{key} in el.etree_element.attrib'
elif selector.operator == '=':
Expand Down
39 changes: 39 additions & 0 deletions tests/test_cssselect2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,45 @@ def test_html_select(selector, result):
ElementWrapper.from_html_root(IDS_ROOT).query_all(selector)]


@pytest.mark.parametrize('wrapper', [
ElementWrapper.from_xml_root, ElementWrapper.from_html_root])
@pytest.mark.parametrize(('operator', 'value'), [
('=', 'Éa'), ('~=', 'before Éa after'), ('|=', 'Éa-fr'),
('^=', 'Éa-after'), ('$=', 'before-Éa'), ('*=', 'before-Éa-after'),
])
def test_attribute_case_insensitive_ascii_only(wrapper, operator, value):
document = etree.Element('div')
etree.SubElement(document, 'div', {'id': 'upper', 'data-value': value})
etree.SubElement(document, 'div', {
'id': 'lower', 'data-value': value.replace('É', 'é')})
root = wrapper(document)
assert [element.id for element in root.query_all(
f'[data-value{operator}"ÉA" i]')] == ['upper']
assert [element.id for element in root.query_all(
f'[data-value{operator}"éA" i]')] == ['lower']


@pytest.mark.parametrize('wrapper', [
ElementWrapper.from_xml_root, ElementWrapper.from_html_root])
@pytest.mark.parametrize(('operator', 'value', 'selector_value'), [
('=', 'K', 'k'), ('=', 'k', 'K'), ('*=', 'İ', 'i'),
])
def test_attribute_case_insensitive_non_ascii_to_ascii(
wrapper, operator, value, selector_value):
root = wrapper(etree.Element('div', {'data-value': value}))
assert not root.matches(f'[data-value{operator}"{selector_value}" i]')


@pytest.mark.parametrize('wrapper', [
ElementWrapper.from_xml_root, ElementWrapper.from_html_root])
@pytest.mark.parametrize(('flag', 'matches'), [
('', False), ('s', False), ('S', False), ('i', True), ('I', True),
])
def test_attribute_case_flags_ascii_controls(wrapper, flag, matches):
root = wrapper(etree.Element('div', {'data-value': 'AbC'}))
assert root.matches(f'[data-value="abc" {flag}]') is matches


# Data borrowed from http://mootools.net/slickspeed/
@pytest.mark.parametrize(('selector', 'result'), [
# Changed from original because we’re only searching the body.
Expand Down