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
20 changes: 15 additions & 5 deletions src/dotenv/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,18 @@ def parse_key(reader: Reader) -> Optional[str]:
return key


def parse_unquoted_value(reader: Reader) -> str:
def parse_unquoted_value(reader: Reader, preceded_by_whitespace: bool = False) -> str:
(part,) = reader.read_regex(_unquoted_value)
# A value that is only an inline comment (e.g. ``KEY= # comment``) is empty.
# The whitespace before the ``#`` is consumed by the equal-sign match, so the
# ``preceded_by_whitespace`` flag is what distinguishes this from a value that
# legitimately starts with ``#`` (e.g. ``KEY=#value``).
if preceded_by_whitespace and part.startswith("#"):
return ""
return re.sub(r"\s+#.*", "", part).rstrip()


def parse_value(reader: Reader) -> str:
def parse_value(reader: Reader, preceded_by_whitespace: bool = False) -> str:
char = reader.peek(1)
if char == "'":
(value,) = reader.read_regex(_single_quoted_value)
Expand All @@ -136,7 +142,7 @@ def parse_value(reader: Reader) -> str:
elif char in ("", "\n", "\r"):
return ""
else:
return parse_unquoted_value(reader)
return parse_unquoted_value(reader, preceded_by_whitespace)


def parse_binding(reader: Reader) -> Binding:
Expand All @@ -154,8 +160,12 @@ def parse_binding(reader: Reader) -> Binding:
key = parse_key(reader)
reader.read_regex(_whitespace)
if reader.peek(1) == "=":
reader.read_regex(_equal_sign)
value: Optional[str] = parse_value(reader)
(equal_sign,) = reader.read_regex(_equal_sign)
# ``_equal_sign`` captures the ``=`` plus any horizontal whitespace,
# so a length > 1 means the value was separated from ``=`` by spaces.
value: Optional[str] = parse_value(
reader, preceded_by_whitespace=len(equal_sign) > 1
)
else:
value = None
reader.read_regex(_comment)
Expand Down
33 changes: 33 additions & 0 deletions tests/test_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,39 @@
)
],
),
(
"a= #c",
[
Binding(
key="a",
value="",
original=Original(string="a= #c", line=1),
error=False,
)
],
),
(
"a= # comment",
[
Binding(
key="a",
value="",
original=Original(string="a= # comment", line=1),
error=False,
)
],
),
(
"a=#b",
[
Binding(
key="a",
value="#b",
original=Original(string="a=#b", line=1),
error=False,
)
],
),
(
"a=b\t#c",
[
Expand Down