pypa · theacodes · Jul 31, 2018 · Jul 28, 2018 · Jul 30, 2018 · Jul 31, 2018
diff --git a/readme_renderer/rst.py b/readme_renderer/rst.py
@@ -14,7 +14,6 @@
 from __future__ import absolute_import, division, print_function
 
 import io
-import os.path
 
 from docutils.core import publish_parts
 from docutils.writers.html4css1 import HTMLTranslator, Writer
@@ -25,26 +24,9 @@
 
 class ReadMeHTMLTranslator(HTMLTranslator):
 
-    def depart_image(self, node):
-        uri = node["uri"]
-        ext = os.path.splitext(uri)[1].lower()
-        # we need to swap RST's use of `object` with `img` tags
-        # see http://git.io/5me3dA
-        if ext == ".svg":
-            # preserve essential attributes
-            atts = {}
-            for attribute, value in node.attributes.items():
-                # we have no time for empty values
-                if value:
-                    if attribute == "uri":
-                        atts["src"] = value
-                    else:
-                        atts[attribute] = value
-
-            # toss off `object` tag
-            self.body.pop()
-            # add on `img` with attributes
-            self.body.append(self.starttag(node, "img", **atts))
+    # We need to swap RST's use of `object` with `img` tags
+    # see http://git.io/5me3dA
+    object_image_types = {'.swf': 'application/x-shockwave-flash'}
 
 
 SETTINGS = {

diff --git a/tests/fixtures/test_rst_img_attrs.html b/tests/fixtures/test_rst_img_attrs.html
diff --git a/tests/fixtures/test_rst_png.html b/tests/fixtures/test_rst_png.html
@@ -0,0 +1 @@
+<img alt="https://example.com/badge.png" src="https://example.com/badge.png">
diff --git a/tests/fixtures/test_rst_png.rst b/tests/fixtures/test_rst_png.rst
@@ -0,0 +1 @@
+.. image:: https://example.com/badge.png
diff --git a/tests/fixtures/test_rst_png_attrs.html b/tests/fixtures/test_rst_png_attrs.html
@@ -0,0 +1 @@
+<img alt="alternate text" src="https://example.com/badge.png">
diff --git a/tests/fixtures/test_rst_png_attrs.rst b/tests/fixtures/test_rst_png_attrs.rst
@@ -0,0 +1,5 @@
+.. image:: https://example.com/badge.png
+   :height: 100px
+   :width: 25.0%
+   :alt: alternate text
+   :align: right
diff --git a/tests/fixtures/test_rst_svg.html b/tests/fixtures/test_rst_svg.html
@@ -1 +1 @@
-<img src="https://example.com/badge.svg">
+<img alt="https://example.com/badge.svg" src="https://example.com/badge.svg">
diff --git a/tests/fixtures/test_rst_svg_attrs.html b/tests/fixtures/test_rst_svg_attrs.html
@@ -0,0 +1 @@
+<img alt="alternate text" src="https://example.com/badge.svg">
diff --git a/tests/fixtures/test_rst_img_attrs.rst → tests/fixtures/test_rst_svg_attrs.rst b/tests/fixtures/test_rst_img_attrs.rst → tests/fixtures/test_rst_svg_attrs.rst
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<img alt="https://example.com/badge.png" src="https://example.com/badge.png">
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<img alt="alternate text" src="https://example.com/badge.png">
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<img src="https://example.com/badge.svg">
		<img alt="https://example.com/badge.svg" src="https://example.com/badge.svg">
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<img alt="alternate text" src="https://example.com/badge.svg">
Copy link Member di Jul 31, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. We're kind of experiencing a regression here, right? Before, this: .. image:: https://example.com/badge.svg :height: 100px :width: 25.0% :alt: alternate text :align: right would become: <img align="right" alt="alternate text" height="100px" src="https://example.com/badge.svg" width="25.0%"> but now it becomes: <img alt="alternate text" src="https://example.com/badge.svg"> Copy link Contributor Author mila Jul 31, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Yes, but the current behavior is problematic: `align="right"` does not actually align the image, CSS is necessary for that. `height="100px"` wont have any effect, because units (`px`) must be added to CSS, not image attributes Those attributes are preserved for SVG images only (or more precisely for URLs ending ".svg") #114 addresses image alignment and dimensions. Without unifying SVG with other image types, the subsequent PR would fix styling of non-SVG images only. (I created two PRs because the second relaxes what HTML is allowed, so there can be more discussion.) Copy link Member di Jul 31, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Got it, thanks for the explanation.