From c73c1b72c83f79451e45b094908877c4cf8687a8 Mon Sep 17 00:00:00 2001 From: Florian Mounier Date: Wed, 19 Nov 2014 10:19:49 +0100 Subject: [PATCH 1/4] Put coverage and reporting in tox --- tox.ini | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 5a26b1e1..f95e4b6f 100644 --- a/tox.ini +++ b/tox.ini @@ -9,5 +9,11 @@ deps= tinycss cssselect cairocffi -commands=nosetests [] sitepackages=True + +setenv = + COVERAGE_FILE=.cov-{envname} + +commands= + coverage run --source=cairosvg {envbindir}/nosetests --with-xunit --xunit-file=junit-{envname}.xml + coverage xml -o coverage-{envname}.xml From 109bb38a97dad85f1618f604d25afa784b468539 Mon Sep 17 00:00:00 2001 From: TWAC <> Date: Mon, 1 Dec 2014 16:13:46 +0100 Subject: [PATCH 2/4] recognise windows absolute filename --- cairosvg/parser.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cairosvg/parser.py b/cairosvg/parser.py index d1176656..c5e3630a 100644 --- a/cairosvg/parser.py +++ b/cairosvg/parser.py @@ -287,7 +287,9 @@ def __init__(self, **kwargs): url = parent.url self.url = url if url: - if urlparse.urlparse(url).scheme: + if url[1:3] == ":\\": + input_ = url # win absolute filename + elif urlparse.urlparse(url).scheme: input_ = urlopen(url) else: input_ = url # filename From dfaff54a6f87ce611ca4ea11bc32fa1915ed8007 Mon Sep 17 00:00:00 2001 From: TWAC <> Date: Mon, 1 Dec 2014 16:27:26 +0100 Subject: [PATCH 3/4] fix not finding relative images --- test/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/__init__.py b/test/__init__.py index 27fb92db..5fec165a 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -43,6 +43,8 @@ TEST_FOLDER = os.path.join(os.path.dirname(__file__), "svg") OUTPUT_FOLDER = os.path.join(os.path.dirname(__file__), "output") +os.chdir(TEST_FOLDER) # relative image urls + if os.environ.get("CAIROSVG_TEST_FILES"): ALL_FILES = os.environ["CAIROSVG_TEST_FILES"].split(",") else: From 662e3763c7be327f5f1cb325b29b105634720d71 Mon Sep 17 00:00:00 2001 From: David McKeone Date: Mon, 12 Jan 2015 15:55:29 -0500 Subject: [PATCH 4/4] Allow Surface.convert.__doc__ to be None when running under -OO (Strips comments and asserts) --- cairosvg/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cairosvg/__init__.py b/cairosvg/__init__.py index 18f3a0fd..97816b75 100644 --- a/cairosvg/__init__.py +++ b/cairosvg/__init__.py @@ -43,8 +43,9 @@ surface_type.convert(*args, **kwargs))(_surface_type) _name = 'svg2%s' % _output_format.lower() _function.__name__ = _name - _function.__doc__ = surface.Surface.convert.__doc__.replace( - 'the format for this class', _output_format) + if surface.Surface.convert.__doc__: + _function.__doc__ = surface.Surface.convert.__doc__.replace( + 'the format for this class', _output_format) setattr(sys.modules[__name__], _name, _function)