Merge branch 'master' of github.com:Kozea/cairosvg

Kozea · Feb 11, 2015 · 4d4f020 · 4d4f020
2 parents d4bb235 + d844b6a
commit 4d4f020
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git 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)
 
 

diff --git 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

diff --git 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:

diff --git 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