Merge branch 'main' into 1636-hidden-xray-vision-dependency-is-still-…

…not-dealt-with-anywhere
bluesky · May 20, 2024 · b727657 · b727657
2 parents 000b5f0 + a17729f
commit b727657
Show file tree

Hide file tree

Showing 5 changed files with 134 additions and 2 deletions.
diff --git a/src/bluesky/callbacks/olog.py b/src/bluesky/callbacks/olog.py
@@ -189,7 +189,8 @@ def start(self, doc):
             )
         )
         olog_status = self.client.log(document_content, logbooks=self.logbook)
+
         logger.debug(
-            "client.log returned  %s", olog_status
+            "client.log returned  %s", olog_status # noqa: UP031
         )  # NOTE this is for logging calls efficiency
         super().start(doc)
diff --git a/src/bluesky/callbacks/tiled_writer.py b/src/bluesky/callbacks/tiled_writer.py
@@ -259,7 +259,7 @@ def _ensure_sres_backcompat(self, sres: StreamResource) -> StreamResource:
         if ("mimetype" not in sres.keys()) and ("spec" not in sres.keys()):
             raise RuntimeError("StreamResource document is missing a mimetype or spec")
         else:
-            sres["mimetype"] = sres.get("mimetype", MIMETYPE_LOOKUP[sres["spec"]])
+            sres["mimetype"] = sres.get("mimetype") or MIMETYPE_LOOKUP[sres.get("spec")]
         if "parameters" not in sres.keys():
             sres["parameters"] = sres.pop("resource_kwargs", {})
         if "uri" not in sres.keys():