dev-python/sphinx: Backport fixes for compatibility with docutils 0.13 #452
Conversation
|
|
||
| + # overwritten | ||
| + def depart_image(self, node): | ||
| + if node['uri'].lower().endswith(('svg', 'svgz')): |
There was a problem hiding this comment.
You depart from upstream fix by not checking for the docutils version. Is this safe to use with docutils-0.12 which is in stable?
There was a problem hiding this comment.
Upstream reverted that version check in sphinx-doc/sphinx@b98e2e3. The important aspect is to keep things balanced: if visit_image does call the base version without modifying the stack itself, then so does depart_image. If visit_image returns without calling the base version, and does push something on the stack, then depart_image doesn't call the base version either, and makes use of the item on the stack. The common check for file extension achieves that these code paths will always match one another.
There was a problem hiding this comment.
OK, I hadn't inspected that commit. So long as it doesn't lock use in docutils-0.13 over 0.12 I see no reason not to merge.
Fixes #451.
I decided not to restrict the version in the dependency, but instead to backport the required modifications. Doing so will avoid contributing to the already long list of packages version-pinned due to some Sage requirement. The first chunk of the patch is probably mostly cosmetic, and not strictly necessary. Let me know if you'd like me to remove that chunk.
See file history of
html.pyfor the commits mentioned in the header of the patch.