Fix image retrieval over urlretrieve + svg import errors #781
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SVG image support is optional. By importing the svgimage module at the top of the image.py module, any rst document that contained an image would rely on having svglib installed. This commit fixes that problem.
For Python 3: from urllib.request import urlretrieve For Python 2: from urllib import urlretrieve Now remote images are correctly retrieved. Resolves rst2pdf#780
|
The SVGImage import change is causes three tests to fail :( |
This reverts commit ab2c81e. This import statement is monkey-patched by the inkscape extension, which means we need to import SVGImage at the module level.
Output in test matches reference image look
This preserves monkey patching behavior for inkscape.
|
@akrabat I've fixed the tests, sorry about that. |
akrabat
approved these changes
Jun 9, 2019
akrabat
added a commit
to akrabat/rst2pdf
that referenced
this pull request
Jun 9, 2019
|
Thanks @pappasam! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #780 and a new svg-related issue.
I followed the same six-related pattern found throughout createpdf.py, genpdftext.py, and pdfbuilder.py.
SVG-related issue
SVG image support is currently optional. By importing the svgimage module at the top of the image.py module, any rst document that contained an image relied on having svglib installed, whether or not that image were an svg. This PR fixes that problem. 馃帀