diff --git a/lobster/common/io.py b/lobster/common/io.py index a8adfad1..ba78d418 100644 --- a/lobster/common/io.py +++ b/lobster/common/io.py @@ -101,8 +101,8 @@ def lobster_read( mh.error(loc, f"unknown schema kind {data['schema']}") if data["version"] not in supported_schema[data["schema"]]: mh.error(loc, - "version %u for schema %s is not supported" % - (data["version"], data["schema"])) + f"version {data['version']} for schema " + f"{data['schema']} is not supported") duplicate_items = [] # Convert to items, and integrate into symbol table diff --git a/lobster/common/items.py b/lobster/common/items.py index c29fc2d4..bfbcc8a9 100644 --- a/lobster/common/items.py +++ b/lobster/common/items.py @@ -161,8 +161,8 @@ def determine_status(self, config, stab): if not any(has_trace[src] for src in chain) and \ not has_just_down: ok_down = False - self.messages.append("missing reference to %s" % - " or ".join(sorted(chain))) + chain_str = " or ".join(sorted(chain)) + self.messages.append(f"missing reference to {chain_str}") # Set status if self.has_error: diff --git a/lobster/common/parser.py b/lobster/common/parser.py index 183648e8..5cf1dcc4 100644 --- a/lobster/common/parser.py +++ b/lobster/common/parser.py @@ -83,7 +83,7 @@ def parse(self): else: self.error(self.nt.loc, "expected: requirements|implementation|activity," - " found %s instead" % self.nt.value()) + f" found {self.nt.value()} instead") return self.levels diff --git a/lobster/common/report.py b/lobster/common/report.py index 89bb06ba..4e27853b 100644 --- a/lobster/common/report.py +++ b/lobster/common/report.py @@ -90,14 +90,13 @@ def resolve_references_for_items(self): # Check versions match, if specified if dst_tag.version is not None: if dst_item.tag.version is None: - src_item.error("tracing destination %s is unversioned" - % dst_tag.key()) + src_item.error( + f"tracing destination {dst_tag.key()} is unversioned" + ) elif dst_tag.version != dst_item.tag.version: - src_item.error("tracing destination %s has version %s" - " (expected %s)" % - (dst_tag.key(), - dst_item.tag.version, - dst_tag.version)) + msg = (f"tracing destination {dst_tag.key()} has version " + f"{dst_item.tag.version} (expected {dst_tag.version})") + src_item.error(msg) def compute_coverage_for_items(self): for level_obj in self.coverage.values(): @@ -237,8 +236,8 @@ def validate_indicated_schema(self, data, loc): self.mh.error(loc, f"unknown schema kind {data['schema']}") if data["version"] not in supported_schema[data["schema"]]: self.mh.error(loc, - "version %u for schema %s is not supported" % - (data["version"], data["schema"])) + f"version {data['version']} for schema " + f"{data['schema']} is not supported") def validate_basic_structure_of_lobster_file(self, data, loc): """ diff --git a/lobster/htmldoc/htmldoc.py b/lobster/htmldoc/htmldoc.py index 0c00aa9e..c9748f15 100644 --- a/lobster/htmldoc/htmldoc.py +++ b/lobster/htmldoc/htmldoc.py @@ -129,9 +129,11 @@ def generate(self, doc) -> List[str]: } rv = ['