Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/topic/bbannier/f-strings'
Browse files Browse the repository at this point in the history
  • Loading branch information
bbannier committed Sep 1, 2023
2 parents c7b2fda + 1cd05fd commit 37eda70
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
1.2.4 | 2023-09-01 09:50:15 +0200

* Fix mutilated f-strings (Benjamin Bannier, Corelight)

1.2.3-4 | 2023-08-30 12:21:09 +0200

* Drop dependency on pytest in default setup (Benjamin Bannier, Corelight)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.3-4
1.2.4
2 changes: 1 addition & 1 deletion zeekscript/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""Wrapper around more low-level tests."""
__version__ = "1.2.3-4"
__version__ = "1.2.4"
__all__ = ["cli", "error", "formatter", "node", "output", "parser", "script"]

from .cli import *
Expand Down
4 changes: 2 additions & 2 deletions zeekscript/script.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,14 @@ def get_error(self):
elif node.is_missing:
msg = (
f'missing grammar node "{node.type}" on '
"line {node.start_point[0]}, col {node.start_point[1]}"
f"line {node.start_point[0]}, col {node.start_point[1]}"
)
elif node.has_error and (
not node.children or not any(kid.has_error for kid in node.children)
):
msg = (
f'grammar node "{node.type}" has error on '
"line {node.start_point[0]}, col {node.start_point[1]}"
f"line {node.start_point[0]}, col {node.start_point[1]}"
)
else:
continue
Expand Down

0 comments on commit 37eda70

Please sign in to comment.