URI-escape image filenames

sphinx/builders/_epub_base.py

@@ -6,6 +6,7 @@
 from os import path
 from typing import Any, Dict, List, NamedTuple, Optional, Set, Tuple
 from zipfile import ZIP_DEFLATED, ZIP_STORED, ZipFile
+from urllib.parse import quote
 
 from docutils import nodes
 from docutils.nodes import Element, Node
@@ -524,7 +525,7 @@ def build_content(self) -> None:
                                        type='epub', subtype='unknown_project_files')
                     continue
                 filename = filename.replace(os.sep, '/')
-                item = ManifestItem(html.escape(filename),
+                item = ManifestItem(html.escape(quote(filename)),
                                     html.escape(self.make_id(filename)),
                                     html.escape(self.media_types[ext]))
                 metadata['manifest_items'].append(item)

sphinx/writers/html.py

@@ -620,7 +620,7 @@ def visit_image(self, node: Element) -> None:
         # rewrite the URI if the environment knows about it
         if olduri in self.builder.images:
             node['uri'] = posixpath.join(self.builder.imgpath,
-                                         self.builder.images[olduri])
+                                         urllib.parse.quote(self.builder.images[olduri]))
 
         if 'scale' in node:
             # Try to figure out image height and width.  Docutils does that too,

sphinx/writers/html5.py

@@ -567,7 +567,7 @@ def visit_image(self, node: Element) -> None:
         # rewrite the URI if the environment knows about it
         if olduri in self.builder.images:
             node['uri'] = posixpath.join(self.builder.imgpath,
-                                         self.builder.images[olduri])
+                                         urllib.parse.quote(self.builder.images[olduri]))
 
         if 'scale' in node:
             # Try to figure out image height and width.  Docutils does that too,

sphinx/writers/latex.py

@@ -1267,14 +1267,17 @@ def visit_image(self, node: Element) -> None:
         if include_graphics_options:
             options = '[%s]' % ','.join(include_graphics_options)
         base, ext = path.splitext(uri)
+
         if self.in_title and base:
             # Lowercase tokens forcely because some fncychap themes capitalize
             # the options of \sphinxincludegraphics unexpectedly (ex. WIDTH=...).
-            self.body.append(r'\lowercase{\sphinxincludegraphics%s}{{%s}%s}' %
-                             (options, base, ext))
+            cmd = r'\lowercase{\sphinxincludegraphics%s}{{%s}%s}' % (options, base, ext)
         else:
-            self.body.append(r'\sphinxincludegraphics%s{{%s}%s}' %
-                             (options, base, ext))
+            cmd = r'\sphinxincludegraphics%s{{%s}%s}' % (options, base, ext)
+        # escape filepath for includegraphics, https://tex.stackexchange.com/a/202714/41112
+        if '#' in base:
+            cmd = r'{\catcode`\#=12' + cmd + '}'
+        self.body.append(cmd)
         self.body.extend(post)
 
     def depart_image(self, node: Element) -> None:

tests/roots/test-root/images.txt

@@ -23,3 +23,6 @@ Sphinx image handling
 
 .. an image with more than 1 dot in its file name
 .. image:: img.foo.png
+
+.. an image with a character that is valid in a local file path but not a URL
+.. image:: img_#1.png

tests/test_build_html.py

@@ -1397,6 +1397,15 @@ def test_html_remote_images(app, status, warning):
     assert not (app.outdir / 'python-logo.png').exists()
 
 
+@pytest.mark.sphinx('html')
+def test_html_encoded_image(app, status, warning):
+    app.builder.build_all()
+
+    result = (app.outdir / 'images.html').read_text()
+    assert ('<img alt="_images/img_%231.png" src="_images/img_%231.png" />' in result)
+    assert (app.outdir / '_images/img_#1.png').exists()
+
+
 @pytest.mark.sphinx('html', testroot='remote-logo')
 def test_html_remote_logo(app, status, warning):
     app.builder.build_all()

tests/test_build_latex.py

@@ -58,8 +58,8 @@ def compile_latex_document(app, filename='python.tex'):
     except OSError as exc:  # most likely the latex executable was not found
         raise pytest.skip.Exception from exc
     except CalledProcessError as exc:
-        print(exc.stdout)
-        print(exc.stderr)
+        print(exc.stdout.decode('utf8'))
+        print(exc.stderr.decode('utf8'))
         raise AssertionError('%s exited with return code %s' % (app.config.latex_engine,
                                                                 exc.returncode))
 

tests/test_environment.py

@@ -54,19 +54,19 @@ def test_images(app):
     htmlbuilder.imgpath = 'dummy'
     htmlbuilder.post_process_images(tree)
     assert set(htmlbuilder.images.keys()) == \
-        {'subdir/img.png', 'img.png', 'subdir/simg.png', 'svgimg.svg', 'img.foo.png'}
+        {'subdir/img.png', 'img.png', 'subdir/simg.png', 'svgimg.svg', 'img.foo.png', 'img_#1.png'}
     assert set(htmlbuilder.images.values()) == \
-        {'img.png', 'img1.png', 'simg.png', 'svgimg.svg', 'img.foo.png'}
+        {'img.png', 'img1.png', 'simg.png', 'svgimg.svg', 'img.foo.png', 'img_#1.png'}
 
     latexbuilder = LaTeXBuilder(app, app.env)
     latexbuilder.init()
     latexbuilder.post_process_images(tree)
     assert set(latexbuilder.images.keys()) == \
         {'subdir/img.png', 'subdir/simg.png', 'img.png', 'img.pdf',
-         'svgimg.pdf', 'img.foo.png'}
+         'svgimg.pdf', 'img.foo.png', 'img_#1.png'}
     assert set(latexbuilder.images.values()) == \
         {'img.pdf', 'img.png', 'img1.png', 'simg.png',
-         'svgimg.pdf', 'img.foo.png'}
+         'svgimg.pdf', 'img.foo.png', 'img_#1.png'}
 
 
 @pytest.mark.sphinx('dummy')