Merge pull request #1065 from sphinx-contrib/drop-legacy-str-casts

drop str-casts for mimetype requests
sphinx-contrib · Dec 5, 2024 · 662a26b · 662a26b
2 parents e6f05c4 + 8b7dfa4
commit 662a26b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/sphinxcontrib/confluencebuilder/assets.py b/sphinxcontrib/confluencebuilder/assets.py
@@ -282,8 +282,7 @@ def _handle_entry(self, path, docname, standalone=False):
 
         if path not in self.path2asset:
             hash_ = ConfluenceUtil.hash_asset(path)
-            # str-cast for sphinx-6.1
-            type_ = guess_mimetype(str(path), default=DEFAULT_CONTENT_TYPE)
+            type_ = guess_mimetype(path, default=DEFAULT_CONTENT_TYPE)
         else:
             hash_ = self.path2asset[path].hash
             type_ = self.path2asset[path].type

diff --git a/sphinxcontrib/confluencebuilder/svg.py b/sphinxcontrib/confluencebuilder/svg.py
@@ -65,7 +65,7 @@ def confluence_supported_svg(builder, node):
         return
 
     # ignore non-svgs
-    mimetype = guess_mimetype(str(abs_path))  # cast for sphinx-6.1
+    mimetype = guess_mimetype(abs_path)
     if mimetype != 'image/svg+xml':
         return