Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def write_str_value(self, key: Optional[str], value: Optional[str]) -> None:
if key and value:
if len(self.writer) > 0:
self.writer += "&"
self.writer += f"{quote_plus(key.strip())}={quote_plus(value)}"
self.writer += f"{quote_plus(key)}={quote_plus(value)}"

def write_bool_value(self, key: Optional[str], value: Optional[bool]) -> None:
"""Writes the specified boolean value to the stream with an optional given key.
Expand Down Expand Up @@ -213,7 +213,7 @@ def write_object_value(
if len(self.writer) > 0:
self.writer += "&"
if key:
self.writer += f"{quote_plus(key.strip())}="
self.writer += f"{quote_plus(key)}="
self.writer += temp_writer.writer
self.depth -= 1

Expand Down Expand Up @@ -316,7 +316,7 @@ def write_non_parsable_object_value(self, key: Optional[str], value: T) -> None:
temp_writer.write_any_value(k, v)
if len(self.writer) > 0:
self.writer += "&"
self.writer += f"{quote_plus(key.strip())}={temp_writer.writer}"
self.writer += f"{quote_plus(key)}={temp_writer.writer}"

def write_any_value(self, key: Optional[str], value: Any) -> Any:
"""Writes the specified value to the stream with an optional given key.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from enum import Enum, IntEnum, IntFlag
from types import SimpleNamespace
from uuid import UUID
from urllib.parse import parse_qs, unquote_plus
import pytest
Expand All @@ -18,6 +19,34 @@ def test_write_str_value_preserves_whitespace(value):
assert parse_qs(writer.get_serialized_content().decode("utf-8"))["label"] == [value]


@pytest.mark.parametrize("key", [" field", "field ", " \t\r\n", "\u2003field\u2003", "ordinary", "a+b&c"])
def test_write_str_value_preserves_field_name(key):
writer = FormSerializationWriter()
writer.write_str_value("field", "first")
writer.write_str_value(key, "second")
content = writer.get_serialized_content().decode("utf-8")
assert parse_qs(content) == {"field": ["first"], key: ["second"]}
node = FormParseNode(content).get_child_node(key)
assert node is not None
assert node.get_str_value() == "second"


@pytest.mark.parametrize("key", [" field ", "\u2003field\u2003", "field"])
def test_write_object_value_preserves_field_name(key):
writer = FormSerializationWriter()
writer.write_object_value(key, TestEntity(office_location="desk"))
assert parse_qs(writer.get_serialized_content().decode("utf-8")) == {
key: ["officeLocation=desk"]
}


@pytest.mark.parametrize("key", [" field ", "\u2003field\u2003", "field"])
def test_write_non_parsable_object_value_preserves_field_name(key):
writer = FormSerializationWriter()
writer.write_non_parsable_object_value(key, SimpleNamespace(label="desk"))
assert parse_qs(writer.get_serialized_content().decode("utf-8")) == {key: ["label=desk"]}


@pytest.mark.parametrize("value", [None, ""])
def test_write_str_value_still_omits_absent_or_empty_values(value):
writer = FormSerializationWriter()
Expand Down