Skip to content

Commit 026fbce

Browse files
authored
Merge pull request #449 from SAY-5/feat/url-pathlike
feat(url): accept path-like objects for the url parameter
2 parents 0613641 + 6eaa366 commit 026fbce

4 files changed

Lines changed: 9 additions & 1 deletion

File tree

‎cairosvg/parser.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"""
55

66
import gzip
7+
import os
78
import re
89
from urllib.parse import urlunparse
910
from xml.etree.ElementTree import Element
@@ -345,6 +346,8 @@ def __init__(self, **kwargs):
345346
bytestring = kwargs.get('bytestring')
346347
file_obj = kwargs.get('file_obj')
347348
url = kwargs.get('url')
349+
if isinstance(url, os.PathLike):
350+
url = os.fspath(url)
348351
unsafe = kwargs.get('unsafe')
349352
parent = kwargs.get('parent')
350353
parent_children = kwargs.get('parent_children')

‎cairosvg/surface.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def convert(cls, bytestring=None, *, file_obj=None, url=None, dpi=96,
105105
106106
:param bytestring: The SVG source as a byte-string.
107107
:param file_obj: A file-like object.
108-
:param url: A filename.
108+
:param url: A filename, given as a string or a path-like object.
109109
110110
Give some options:
111111

‎cairosvg/test_api.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ def test_api(tmp_path):
6969
assert svg2png(url=str(temp_0)) == expected_content
7070
assert svg2png(url=f'file://{temp_0}') == expected_content
7171

72+
# Read from a pathlib.Path
73+
assert svg2png(url=temp_0) == expected_content
74+
7275
with temp_0.open('rb') as file_object:
7376
# Read from a real file object
7477
assert svg2png(file_obj=file_object) == expected_content

‎cairosvg/url.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ def parse_url(url, base=None):
104104
the "folder" part of it is prepended to the URL.
105105
106106
"""
107+
if isinstance(url, os.PathLike):
108+
url = os.fspath(url)
107109
if url:
108110
match = URL.search(url)
109111
if match:

0 commit comments

Comments
 (0)