Skip to content

Preserve numeric zero in named URI parameters #159

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

Open
bensynapse wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Preserve numeric zero in named URI parameters #159

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
28 changes: 28 additions & 0 deletions tests/test_uritemplate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,34 @@ def test_expand(self) -> None:
self.assertEqual(expand("{/zero}", self.context), "/0")
self.assertEqual(expand("{/zero,a_float}", self.context), "/0/3.1415")

def test_zero_parameter_expansions(self) -> None:
cases: t.List[t.Tuple[variable.ScalarVariableValue, str]] = [
(0, "0"),
(0.0, "0.0"),
(-0.0, "-0.0"),
(0j, "0j"),
]
for value, expected in cases:
for operator in ("?", "&", ";"):
for modifier in ("", "*"):
template = f"{{{operator}zero{modifier}}}"
with self.subTest(template=template, value=value):
self.assertEqual(
expand(template, {"zero": value}),
f"{operator}zero={expected}",
)

def test_empty_parameter_expansions(self) -> None:
for operator, expected in (
("?", "?zero="),
("&", "&zero="),
(";", ";zero"),
):
template = f"{{{operator}zero}}"
with self.subTest(template=template):
self.assertEqual(expand(template, {"zero": ""}), expected)
self.assertEqual(expand(template, {"zero": None}), "")


if __name__ == "__main__":
unittest.main()
11 changes: 5 additions & 6 deletions uritemplate/variable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,11 +310,9 @@ def _query_expansion(
)
return f"{name}={value}"

if value:
value = t.cast(t.Text, value)
value = value[:prefix] if prefix else value
return f"{name}={_quote(value)}"
return name + "="
value = t.cast(t.Text, value)
value = value[:prefix] if prefix else value
return f"{name}={_quote(value)}"

def _label_path_expansion(
self,
Expand Down Expand Up @@ -415,8 +413,9 @@ def _semi_path_expansion(

value = t.cast(t.Text, value)
value = value[:prefix] if prefix else value
value = self.operator.quote(value)
if value:
return f"{name}={self.operator.quote(value)}"
return f"{name}={value}"

return name

Expand Down