Remove deprecation warnings with pytest 3

Author: liZe

cairosvg/path.py

@@ -166,7 +166,8 @@ def path(surface, node):
 
         if last_letter in (None, 'm', 'M', 'z', 'Z'):
             first_path_point = None
-        if letter not in (None, 'm', 'M', 'z', 'Z') and first_path_point is None:
+        if letter not in (None, 'm', 'M', 'z', 'Z') and (
+                first_path_point is None):
             first_path_point = current_point
 
         if letter in 'aA':

cairosvg/surface.py

@@ -134,7 +134,9 @@ def convert(cls, bytestring=None, **kwargs):
         kwargs['bytestring'] = bytestring
         tree = Tree(**kwargs)
         output = write_to or io.BytesIO()
-        cls(tree, output, dpi, None, parent_width, parent_height, scale).finish()
+        instance = cls(
+            tree, output, dpi, None, parent_width, parent_height, scale)
+        instance.finish()
         if write_to is None:
             return output.getvalue()
 

cairosvg/test_api.py

@@ -28,6 +28,7 @@
 import tempfile
 
 import cairocffi as cairo
+import pytest
 
 from . import SURFACES, __version__, main, parser, surface, svg2pdf, svg2png
 
@@ -49,19 +50,11 @@
 '''
 
 
-def test_formats():
+@pytest.mark.parametrize('format_name', MAGIC_NUMBERS)
+def test_formats(format_name):
     """Convert to a given format and test that output looks right."""
-    for format_name in MAGIC_NUMBERS:
-        # Use a default parameter value to bind to the current value,
-        # not to the variabl as a closure would do.
-        def test(format_name=format_name):
-            """Test the generation of ``format_name`` images."""
-            content = SURFACES[format_name].convert(SVG_SAMPLE)
-            assert content.startswith(MAGIC_NUMBERS[format_name])
-        test.description = (
-            'Test that the output from svg2{} looks like {}'.format(
-                format_name.lower(), format_name))
-        yield test
+    content = SURFACES[format_name].convert(SVG_SAMPLE)
+    assert content.startswith(MAGIC_NUMBERS[format_name])
 
 
 def read_file(filename):

pytest.ini

@@ -3,3 +3,7 @@ test = pytest
 
 [bdist_wheel]
 python-tag = py3
+
+[tool:pytest]
+addopts = --flake8 --isort --cov --ignore=test/cairosvg_reference
+norecursedirs = dist .cache .git build *.egg-info .eggs venv cairosvg_reference

setup.cfg

@@ -25,47 +25,36 @@
 import os
 import tempfile
 
-from . import FILES, cairosvg, reference_cairosvg
-
-
-def generate_function(description):
-    """Return a testing function with the given ``description``."""
-    def check_image(svg_filename):
-        """Check that the pixels match between ``svg`` and ``png``."""
-        test_png = tempfile.NamedTemporaryFile(
-            prefix='test-', suffix='.png', delete=False)
-        test_surface = cairosvg.surface.PNGSurface(
-            cairosvg.parser.Tree(url=svg_filename, unsafe=True), test_png,
-            dpi=72)
-        test_pixels = test_surface.cairo.get_data()[:]
-
-        ref_png = tempfile.NamedTemporaryFile(
-            prefix='reference-', suffix='.png', delete=False)
-        ref_surface = reference_cairosvg.surface.PNGSurface(
-            reference_cairosvg.parser.Tree(url=svg_filename, unsafe=True),
-            ref_png, dpi=72)
-        ref_pixels = ref_surface.cairo.get_data()[:]
+import pytest
 
-        if test_pixels == ref_pixels:
-            # Test is passing
-            os.remove(ref_png.name)
-            os.remove(test_png.name)
-        else:  # pragma: no cover
-            ref_surface.finish()
-            test_surface.finish()
-
-            raise AssertionError(
-                'Images are different: {} {}'.format(
-                    ref_png.name, test_png.name))
-
-    check_image.description = description
-    return check_image
+from . import FILES, cairosvg, reference_cairosvg
 
 
-def test_images():
-    """Yield the functions testing an image."""
-    for svg_filename in FILES:
-        yield (
-            generate_function(
-                'Test the {} image'.format(os.path.basename(svg_filename))),
-            svg_filename)
+@pytest.mark.parametrize('svg_filename', FILES)
+def test_image(svg_filename):
+    """Check that the pixels match between ``svg`` and ``png``."""
+    test_png = tempfile.NamedTemporaryFile(
+        prefix='test-', suffix='.png', delete=False)
+    test_surface = cairosvg.surface.PNGSurface(
+        cairosvg.parser.Tree(url=svg_filename, unsafe=True), test_png,
+        dpi=72)
+    test_pixels = test_surface.cairo.get_data()[:]
+
+    ref_png = tempfile.NamedTemporaryFile(
+        prefix='reference-', suffix='.png', delete=False)
+    ref_surface = reference_cairosvg.surface.PNGSurface(
+        reference_cairosvg.parser.Tree(url=svg_filename, unsafe=True),
+        ref_png, dpi=72)
+    ref_pixels = ref_surface.cairo.get_data()[:]
+
+    if test_pixels == ref_pixels:
+        # Test is passing
+        os.remove(ref_png.name)
+        os.remove(test_png.name)
+    else:  # pragma: no cover
+        ref_surface.finish()
+        test_surface.finish()
+
+        raise AssertionError(
+            'Images are different: {} {}'.format(
+                ref_png.name, test_png.name))