From 7da17ad41e77be486828189f8a1baac0b049df36 Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Sun, 13 Jan 2019 09:00:12 -0800 Subject: [PATCH] Improve pytest configuration to allow specific tests as CLI args The previous test configuration made it difficult to run a single test with the pytest CLI. There were two major issues: - The Tests directory was not a package. It now includes a __init__.py file and imports from other tests modules are done with relative imports. - setup.cfg always specified the Tests directory. So even if a specific test were specified as a CLI arg, this configuration would also always include all tests. This configuration has been removed to allow specifying a single test on the command line. Contributors can now run specific tests with a single command such as: $ tox -e py37 -- Tests/test_file_pdf.py::TestFilePdf.test_rgb This makes it easy and faster to iterate on a single test failure and is very familiar to those that have previously used tox and pytest. When running tox or pytest with no arguments, they still discover and runs all tests in the Tests directory. --- Tests/__init__.py | 0 Tests/bench_cffi_access.py | 2 +- Tests/bench_get.py | 2 +- Tests/check_fli_overflow.py | 2 +- Tests/check_imaging_leaks.py | 2 +- Tests/check_j2k_leaks.py | 2 +- Tests/check_j2k_overflow.py | 2 +- Tests/check_jpeg_leaks.py | 2 +- Tests/check_large_memory.py | 2 +- Tests/check_large_memory_numpy.py | 2 +- Tests/check_libtiff_segfault.py | 2 +- Tests/check_png_dos.py | 2 +- Tests/test_000_sanity.py | 2 +- Tests/test_binary.py | 2 +- Tests/test_bmp_reference.py | 2 +- Tests/test_box_blur.py | 2 +- Tests/test_color_lut.py | 2 +- Tests/test_core_resources.py | 2 +- Tests/test_decompression_bomb.py | 2 +- Tests/test_features.py | 2 +- Tests/test_file_blp.py | 2 +- Tests/test_file_bmp.py | 2 +- Tests/test_file_bufrstub.py | 2 +- Tests/test_file_container.py | 2 +- Tests/test_file_cur.py | 2 +- Tests/test_file_dcx.py | 2 +- Tests/test_file_dds.py | 2 +- Tests/test_file_eps.py | 2 +- Tests/test_file_fitsstub.py | 2 +- Tests/test_file_fli.py | 2 +- Tests/test_file_fpx.py | 2 +- Tests/test_file_ftex.py | 2 +- Tests/test_file_gbr.py | 2 +- Tests/test_file_gd.py | 2 +- Tests/test_file_gif.py | 2 +- Tests/test_file_gimpgradient.py | 2 +- Tests/test_file_gimppalette.py | 2 +- Tests/test_file_gribstub.py | 2 +- Tests/test_file_hdf5stub.py | 2 +- Tests/test_file_icns.py | 2 +- Tests/test_file_ico.py | 2 +- Tests/test_file_im.py | 2 +- Tests/test_file_iptc.py | 2 +- Tests/test_file_jpeg.py | 4 ++-- Tests/test_file_jpeg2k.py | 2 +- Tests/test_file_libtiff.py | 2 +- Tests/test_file_libtiff_small.py | 4 ++-- Tests/test_file_mcidas.py | 2 +- Tests/test_file_mic.py | 2 +- Tests/test_file_mpo.py | 2 +- Tests/test_file_msp.py | 2 +- Tests/test_file_palm.py | 2 +- Tests/test_file_pcd.py | 2 +- Tests/test_file_pcx.py | 2 +- Tests/test_file_pdf.py | 2 +- Tests/test_file_pixar.py | 2 +- Tests/test_file_png.py | 2 +- Tests/test_file_ppm.py | 2 +- Tests/test_file_psd.py | 2 +- Tests/test_file_sgi.py | 2 +- Tests/test_file_spider.py | 2 +- Tests/test_file_sun.py | 2 +- Tests/test_file_tar.py | 2 +- Tests/test_file_tga.py | 2 +- Tests/test_file_tiff.py | 2 +- Tests/test_file_tiff_metadata.py | 2 +- Tests/test_file_wal.py | 2 +- Tests/test_file_webp.py | 2 +- Tests/test_file_webp_alpha.py | 2 +- Tests/test_file_webp_animated.py | 2 +- Tests/test_file_webp_lossless.py | 2 +- Tests/test_file_webp_metadata.py | 2 +- Tests/test_file_wmf.py | 2 +- Tests/test_file_xbm.py | 2 +- Tests/test_file_xpm.py | 2 +- Tests/test_file_xvthumb.py | 2 +- Tests/test_font_bdf.py | 2 +- Tests/test_font_leaks.py | 2 +- Tests/test_font_pcf.py | 2 +- Tests/test_format_hsv.py | 2 +- Tests/test_format_lab.py | 2 +- Tests/test_image.py | 2 +- Tests/test_image_access.py | 2 +- Tests/test_image_array.py | 2 +- Tests/test_image_convert.py | 2 +- Tests/test_image_copy.py | 2 +- Tests/test_image_crop.py | 2 +- Tests/test_image_draft.py | 2 +- Tests/test_image_filter.py | 2 +- Tests/test_image_frombytes.py | 2 +- Tests/test_image_fromqimage.py | 4 ++-- Tests/test_image_getbands.py | 2 +- Tests/test_image_getbbox.py | 2 +- Tests/test_image_getcolors.py | 2 +- Tests/test_image_getdata.py | 2 +- Tests/test_image_getextrema.py | 2 +- Tests/test_image_getim.py | 2 +- Tests/test_image_getpalette.py | 2 +- Tests/test_image_getprojection.py | 2 +- Tests/test_image_histogram.py | 2 +- Tests/test_image_load.py | 2 +- Tests/test_image_mode.py | 2 +- Tests/test_image_paste.py | 2 +- Tests/test_image_point.py | 2 +- Tests/test_image_putalpha.py | 2 +- Tests/test_image_putdata.py | 2 +- Tests/test_image_putpalette.py | 2 +- Tests/test_image_quantize.py | 2 +- Tests/test_image_resample.py | 2 +- Tests/test_image_resize.py | 2 +- Tests/test_image_rotate.py | 2 +- Tests/test_image_split.py | 2 +- Tests/test_image_thumbnail.py | 2 +- Tests/test_image_tobitmap.py | 2 +- Tests/test_image_tobytes.py | 2 +- Tests/test_image_transform.py | 2 +- Tests/test_image_transpose.py | 4 ++-- Tests/test_imagechops.py | 2 +- Tests/test_imagecms.py | 2 +- Tests/test_imagecolor.py | 2 +- Tests/test_imagedraw.py | 2 +- Tests/test_imagedraw2.py | 2 +- Tests/test_imageenhance.py | 2 +- Tests/test_imagefile.py | 2 +- Tests/test_imagefont.py | 2 +- Tests/test_imagefont_bitmap.py | 2 +- Tests/test_imagefontctl.py | 2 +- Tests/test_imagegrab.py | 2 +- Tests/test_imagemath.py | 2 +- Tests/test_imagemorph.py | 2 +- Tests/test_imageops.py | 2 +- Tests/test_imageops_usm.py | 2 +- Tests/test_imagepalette.py | 2 +- Tests/test_imagepath.py | 2 +- Tests/test_imageqt.py | 2 +- Tests/test_imagesequence.py | 2 +- Tests/test_imageshow.py | 2 +- Tests/test_imagestat.py | 2 +- Tests/test_imagetk.py | 2 +- Tests/test_imagewin.py | 2 +- Tests/test_imagewin_pointers.py | 2 +- Tests/test_lib_image.py | 2 +- Tests/test_lib_pack.py | 2 +- Tests/test_locale.py | 2 +- Tests/test_map.py | 2 +- Tests/test_mode_i16.py | 2 +- Tests/test_numpy.py | 2 +- Tests/test_pdfparser.py | 2 +- Tests/test_pickle.py | 2 +- Tests/test_psdraw.py | 2 +- Tests/test_pyroma.py | 2 +- Tests/test_qt_image_fromqpixmap.py | 4 ++-- Tests/test_qt_image_toqimage.py | 4 ++-- Tests/test_qt_image_toqpixmap.py | 4 ++-- Tests/test_shell_injection.py | 4 ++-- Tests/test_tiff_ifdrational.py | 2 +- Tests/test_uploader.py | 2 +- Tests/test_util.py | 2 +- Tests/test_webp_leaks.py | 2 +- setup.cfg | 3 --- tox.ini | 2 +- 161 files changed, 167 insertions(+), 170 deletions(-) create mode 100644 Tests/__init__.py diff --git a/Tests/__init__.py b/Tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/Tests/bench_cffi_access.py b/Tests/bench_cffi_access.py index 300017168..79427dca3 100644 --- a/Tests/bench_cffi_access.py +++ b/Tests/bench_cffi_access.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper # Not running this test by default. No DOS against Travis CI. diff --git a/Tests/bench_get.py b/Tests/bench_get.py index e9afe1af5..68ac2c9a2 100644 --- a/Tests/bench_get.py +++ b/Tests/bench_get.py @@ -1,4 +1,4 @@ -import helper +from . import helper import timeit import sys diff --git a/Tests/check_fli_overflow.py b/Tests/check_fli_overflow.py index 9b370da3c..3f7c58015 100644 --- a/Tests/check_fli_overflow.py +++ b/Tests/check_fli_overflow.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image TEST_FILE = "Tests/images/fli_overflow.fli" diff --git a/Tests/check_imaging_leaks.py b/Tests/check_imaging_leaks.py index 0c41b6da1..7fa0663e8 100755 --- a/Tests/check_imaging_leaks.py +++ b/Tests/check_imaging_leaks.py @@ -1,7 +1,7 @@ #!/usr/bin/env python from __future__ import division -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase import sys from PIL import Image diff --git a/Tests/check_j2k_leaks.py b/Tests/check_j2k_leaks.py index 5fafccbc0..d87b7f041 100755 --- a/Tests/check_j2k_leaks.py +++ b/Tests/check_j2k_leaks.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase import sys from PIL import Image from io import BytesIO diff --git a/Tests/check_j2k_overflow.py b/Tests/check_j2k_overflow.py index 1dd8db69f..f456ebb32 100644 --- a/Tests/check_j2k_overflow.py +++ b/Tests/check_j2k_overflow.py @@ -1,5 +1,5 @@ from PIL import Image -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase class TestJ2kEncodeOverflow(PillowTestCase): diff --git a/Tests/check_jpeg_leaks.py b/Tests/check_jpeg_leaks.py index c85f6f030..97a5650e0 100644 --- a/Tests/check_jpeg_leaks.py +++ b/Tests/check_jpeg_leaks.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from io import BytesIO import sys diff --git a/Tests/check_large_memory.py b/Tests/check_large_memory.py index 5c8dc10f7..24d687ea6 100644 --- a/Tests/check_large_memory.py +++ b/Tests/check_large_memory.py @@ -1,6 +1,6 @@ import sys -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase # This test is not run automatically. # diff --git a/Tests/check_large_memory_numpy.py b/Tests/check_large_memory_numpy.py index e48d98367..b66988fd5 100644 --- a/Tests/check_large_memory_numpy.py +++ b/Tests/check_large_memory_numpy.py @@ -1,6 +1,6 @@ import sys -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase # This test is not run automatically. # diff --git a/Tests/check_libtiff_segfault.py b/Tests/check_libtiff_segfault.py index 6611648a5..f8c4a3090 100644 --- a/Tests/check_libtiff_segfault.py +++ b/Tests/check_libtiff_segfault.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image TEST_FILE = "Tests/images/libtiff_segfault.tif" diff --git a/Tests/check_png_dos.py b/Tests/check_png_dos.py index 0cb775aed..9a446bf84 100644 --- a/Tests/check_png_dos.py +++ b/Tests/check_png_dos.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image, PngImagePlugin, ImageFile from io import BytesIO import zlib diff --git a/Tests/test_000_sanity.py b/Tests/test_000_sanity.py index 62a9b5870..c2bbdc7d1 100644 --- a/Tests/test_000_sanity.py +++ b/Tests/test_000_sanity.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase import PIL import PIL.Image diff --git a/Tests/test_binary.py b/Tests/test_binary.py index 7e22e0f59..5c2aa35b7 100644 --- a/Tests/test_binary.py +++ b/Tests/test_binary.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import _binary diff --git a/Tests/test_bmp_reference.py b/Tests/test_bmp_reference.py index b3121e305..0e2e001e5 100644 --- a/Tests/test_bmp_reference.py +++ b/Tests/test_bmp_reference.py @@ -1,5 +1,5 @@ from __future__ import print_function -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image import os diff --git a/Tests/test_box_blur.py b/Tests/test_box_blur.py index 2787dfc0d..9af6ca340 100644 --- a/Tests/test_box_blur.py +++ b/Tests/test_box_blur.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image, ImageFilter diff --git a/Tests/test_color_lut.py b/Tests/test_color_lut.py index 6c8a185df..b47a4d4c1 100644 --- a/Tests/test_color_lut.py +++ b/Tests/test_color_lut.py @@ -3,7 +3,7 @@ from __future__ import division from array import array from PIL import Image, ImageFilter -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase try: import numpy diff --git a/Tests/test_core_resources.py b/Tests/test_core_resources.py index fd8fb4244..9a5828e2b 100644 --- a/Tests/test_core_resources.py +++ b/Tests/test_core_resources.py @@ -2,7 +2,7 @@ from __future__ import division, print_function import sys -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image diff --git a/Tests/test_decompression_bomb.py b/Tests/test_decompression_bomb.py index 0a30e25f1..96999467f 100644 --- a/Tests/test_decompression_bomb.py +++ b/Tests/test_decompression_bomb.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image diff --git a/Tests/test_features.py b/Tests/test_features.py index 03ad0d4c9..963ef2f60 100644 --- a/Tests/test_features.py +++ b/Tests/test_features.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import features diff --git a/Tests/test_file_blp.py b/Tests/test_file_blp.py index e0530cb1f..a82f37bcf 100644 --- a/Tests/test_file_blp.py +++ b/Tests/test_file_blp.py @@ -1,6 +1,6 @@ from PIL import Image -from helper import PillowTestCase, unittest +from .helper import PillowTestCase, unittest class TestFileBlp(PillowTestCase): diff --git a/Tests/test_file_bmp.py b/Tests/test_file_bmp.py index bfd97016f..062bcf635 100644 --- a/Tests/test_file_bmp.py +++ b/Tests/test_file_bmp.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, BmpImagePlugin import io diff --git a/Tests/test_file_bufrstub.py b/Tests/test_file_bufrstub.py index 08980a996..cfee5cd04 100644 --- a/Tests/test_file_bufrstub.py +++ b/Tests/test_file_bufrstub.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import BufrStubImagePlugin, Image diff --git a/Tests/test_file_container.py b/Tests/test_file_container.py index 55228be0c..a4df06630 100644 --- a/Tests/test_file_container.py +++ b/Tests/test_file_container.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image from PIL import ContainerIO diff --git a/Tests/test_file_cur.py b/Tests/test_file_cur.py index 1628007ee..f357cd056 100644 --- a/Tests/test_file_cur.py +++ b/Tests/test_file_cur.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image, CurImagePlugin diff --git a/Tests/test_file_dcx.py b/Tests/test_file_dcx.py index 52c0e13f4..47a16c61d 100644 --- a/Tests/test_file_dcx.py +++ b/Tests/test_file_dcx.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, DcxImagePlugin diff --git a/Tests/test_file_dds.py b/Tests/test_file_dds.py index ec975f7ec..3d10fe1f2 100644 --- a/Tests/test_file_dds.py +++ b/Tests/test_file_dds.py @@ -1,6 +1,6 @@ from io import BytesIO -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image, DdsImagePlugin TEST_FILE_DXT1 = "Tests/images/dxt1-rgb-4bbp-noalpha_MipMaps-1.dds" diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py index dea795ec3..d46fb9e95 100644 --- a/Tests/test_file_eps.py +++ b/Tests/test_file_eps.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, EpsImagePlugin import io diff --git a/Tests/test_file_fitsstub.py b/Tests/test_file_fitsstub.py index d74e983ce..3967aa3ae 100644 --- a/Tests/test_file_fitsstub.py +++ b/Tests/test_file_fitsstub.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import FitsStubImagePlugin, Image diff --git a/Tests/test_file_fli.py b/Tests/test_file_fli.py index 77eaebaa5..9dbfad0d6 100644 --- a/Tests/test_file_fli.py +++ b/Tests/test_file_fli.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image, FliImagePlugin diff --git a/Tests/test_file_fpx.py b/Tests/test_file_fpx.py index 441a3e635..15ac50c17 100644 --- a/Tests/test_file_fpx.py +++ b/Tests/test_file_fpx.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase try: from PIL import FpxImagePlugin diff --git a/Tests/test_file_ftex.py b/Tests/test_file_ftex.py index 6b43244c9..bdb91cc06 100644 --- a/Tests/test_file_ftex.py +++ b/Tests/test_file_ftex.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image diff --git a/Tests/test_file_gbr.py b/Tests/test_file_gbr.py index 346605bd4..12b5e30bb 100644 --- a/Tests/test_file_gbr.py +++ b/Tests/test_file_gbr.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image, GbrImagePlugin diff --git a/Tests/test_file_gd.py b/Tests/test_file_gd.py index b303369b4..85ecf154b 100644 --- a/Tests/test_file_gd.py +++ b/Tests/test_file_gd.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import GdImageFile diff --git a/Tests/test_file_gif.py b/Tests/test_file_gif.py index a85655535..5965472d1 100644 --- a/Tests/test_file_gif.py +++ b/Tests/test_file_gif.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper, netpbm_available +from .helper import unittest, PillowTestCase, hopper, netpbm_available from PIL import Image, ImagePalette, GifImagePlugin diff --git a/Tests/test_file_gimpgradient.py b/Tests/test_file_gimpgradient.py index b29f6f13b..f79927d78 100644 --- a/Tests/test_file_gimpgradient.py +++ b/Tests/test_file_gimpgradient.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import GimpGradientFile diff --git a/Tests/test_file_gimppalette.py b/Tests/test_file_gimppalette.py index 4ee5323bc..7838250b0 100644 --- a/Tests/test_file_gimppalette.py +++ b/Tests/test_file_gimppalette.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL.GimpPaletteFile import GimpPaletteFile diff --git a/Tests/test_file_gribstub.py b/Tests/test_file_gribstub.py index b3a6f1a5a..246167667 100644 --- a/Tests/test_file_gribstub.py +++ b/Tests/test_file_gribstub.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import GribStubImagePlugin, Image diff --git a/Tests/test_file_hdf5stub.py b/Tests/test_file_hdf5stub.py index 6cddd8d7b..c349607d0 100644 --- a/Tests/test_file_hdf5stub.py +++ b/Tests/test_file_hdf5stub.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Hdf5StubImagePlugin, Image diff --git a/Tests/test_file_icns.py b/Tests/test_file_icns.py index 5e0f377c4..64db49ec6 100644 --- a/Tests/test_file_icns.py +++ b/Tests/test_file_icns.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image, IcnsImagePlugin diff --git a/Tests/test_file_ico.py b/Tests/test_file_ico.py index e1ec27932..878c24dcf 100644 --- a/Tests/test_file_ico.py +++ b/Tests/test_file_ico.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper import io from PIL import Image, IcoImagePlugin diff --git a/Tests/test_file_im.py b/Tests/test_file_im.py index f3349b736..8a720ab29 100644 --- a/Tests/test_file_im.py +++ b/Tests/test_file_im.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, ImImagePlugin diff --git a/Tests/test_file_iptc.py b/Tests/test_file_iptc.py index e08d994a2..8567e96e8 100644 --- a/Tests/test_file_iptc.py +++ b/Tests/test_file_iptc.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, IptcImagePlugin diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index 1485651c7..82e55b301 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -1,5 +1,5 @@ -from helper import unittest, PillowTestCase, hopper -from helper import djpeg_available, cjpeg_available +from .helper import unittest, PillowTestCase, hopper +from .helper import djpeg_available, cjpeg_available from io import BytesIO import os diff --git a/Tests/test_file_jpeg2k.py b/Tests/test_file_jpeg2k.py index db61b301b..f3f74bb87 100644 --- a/Tests/test_file_jpeg2k.py +++ b/Tests/test_file_jpeg2k.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image, Jpeg2KImagePlugin from io import BytesIO diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py index 63dc49cde..9a37034b2 100644 --- a/Tests/test_file_libtiff.py +++ b/Tests/test_file_libtiff.py @@ -1,5 +1,5 @@ from __future__ import print_function -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import features from PIL._util import py3 diff --git a/Tests/test_file_libtiff_small.py b/Tests/test_file_libtiff_small.py index c402673d8..77cf6d1bf 100644 --- a/Tests/test_file_libtiff_small.py +++ b/Tests/test_file_libtiff_small.py @@ -1,8 +1,8 @@ -from helper import unittest +from .helper import unittest from PIL import Image -from test_file_libtiff import LibTiffTestCase +from .test_file_libtiff import LibTiffTestCase class TestFileLibTiffSmall(LibTiffTestCase): diff --git a/Tests/test_file_mcidas.py b/Tests/test_file_mcidas.py index 491d8ea03..3a81be39f 100644 --- a/Tests/test_file_mcidas.py +++ b/Tests/test_file_mcidas.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image, McIdasImagePlugin diff --git a/Tests/test_file_mic.py b/Tests/test_file_mic.py index f4059f9c9..6b0fe3ade 100644 --- a/Tests/test_file_mic.py +++ b/Tests/test_file_mic.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, ImagePalette, features diff --git a/Tests/test_file_mpo.py b/Tests/test_file_mpo.py index 9f79d8cfa..6f99198c0 100644 --- a/Tests/test_file_mpo.py +++ b/Tests/test_file_mpo.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from io import BytesIO from PIL import Image diff --git a/Tests/test_file_msp.py b/Tests/test_file_msp.py index 4aac88092..0ff034041 100644 --- a/Tests/test_file_msp.py +++ b/Tests/test_file_msp.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, MspImagePlugin diff --git a/Tests/test_file_palm.py b/Tests/test_file_palm.py index b97a9b19e..8ff327a76 100644 --- a/Tests/test_file_palm.py +++ b/Tests/test_file_palm.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper, imagemagick_available +from .helper import unittest, PillowTestCase, hopper, imagemagick_available import os.path diff --git a/Tests/test_file_pcd.py b/Tests/test_file_pcd.py index 06fd33043..58de88488 100644 --- a/Tests/test_file_pcd.py +++ b/Tests/test_file_pcd.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image diff --git a/Tests/test_file_pcx.py b/Tests/test_file_pcx.py index 415827e49..d56ddace6 100644 --- a/Tests/test_file_pcx.py +++ b/Tests/test_file_pcx.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, ImageFile, PcxImagePlugin diff --git a/Tests/test_file_pdf.py b/Tests/test_file_pdf.py index 57f1c2118..172bde2e4 100644 --- a/Tests/test_file_pdf.py +++ b/Tests/test_file_pdf.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, PdfParser import io import os diff --git a/Tests/test_file_pixar.py b/Tests/test_file_pixar.py index 3b00c710e..fd814baf9 100644 --- a/Tests/test_file_pixar.py +++ b/Tests/test_file_pixar.py @@ -1,4 +1,4 @@ -from helper import hopper, unittest, PillowTestCase +from .helper import hopper, unittest, PillowTestCase from PIL import Image, PixarImagePlugin diff --git a/Tests/test_file_png.py b/Tests/test_file_png.py index c94f8eaad..43121e247 100644 --- a/Tests/test_file_png.py +++ b/Tests/test_file_png.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, PillowLeakTestCase, hopper +from .helper import unittest, PillowTestCase, PillowLeakTestCase, hopper from PIL import Image, ImageFile, PngImagePlugin from PIL._util import py3 diff --git a/Tests/test_file_ppm.py b/Tests/test_file_ppm.py index 937a9dc32..a7ff57aa9 100644 --- a/Tests/test_file_ppm.py +++ b/Tests/test_file_ppm.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image diff --git a/Tests/test_file_psd.py b/Tests/test_file_psd.py index afc69694d..494596b11 100644 --- a/Tests/test_file_psd.py +++ b/Tests/test_file_psd.py @@ -1,4 +1,4 @@ -from helper import hopper, unittest, PillowTestCase +from .helper import hopper, unittest, PillowTestCase from PIL import Image, PsdImagePlugin diff --git a/Tests/test_file_sgi.py b/Tests/test_file_sgi.py index 76f8a3841..ded962b85 100644 --- a/Tests/test_file_sgi.py +++ b/Tests/test_file_sgi.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, SgiImagePlugin diff --git a/Tests/test_file_spider.py b/Tests/test_file_spider.py index 4612b36a1..9f4f86b16 100644 --- a/Tests/test_file_spider.py +++ b/Tests/test_file_spider.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image from PIL import ImageSequence diff --git a/Tests/test_file_sun.py b/Tests/test_file_sun.py index 61cfdf367..5d80aa2dd 100644 --- a/Tests/test_file_sun.py +++ b/Tests/test_file_sun.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, SunImagePlugin diff --git a/Tests/test_file_tar.py b/Tests/test_file_tar.py index 7f29c5fc5..1b7c3c1b7 100644 --- a/Tests/test_file_tar.py +++ b/Tests/test_file_tar.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image, TarIO diff --git a/Tests/test_file_tga.py b/Tests/test_file_tga.py index 77695f2d1..37476dca9 100644 --- a/Tests/test_file_tga.py +++ b/Tests/test_file_tga.py @@ -2,7 +2,7 @@ import os from glob import glob from itertools import product -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py index 4a0bfea58..7a18e40f0 100644 --- a/Tests/test_file_tiff.py +++ b/Tests/test_file_tiff.py @@ -2,7 +2,7 @@ import logging from io import BytesIO import sys -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, TiffImagePlugin from PIL._util import py3 diff --git a/Tests/test_file_tiff_metadata.py b/Tests/test_file_tiff_metadata.py index 7407cc456..54c26cf81 100644 --- a/Tests/test_file_tiff_metadata.py +++ b/Tests/test_file_tiff_metadata.py @@ -1,7 +1,7 @@ import io import struct -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, TiffImagePlugin, TiffTags from PIL.TiffImagePlugin import _limit_rational, IFDRational diff --git a/Tests/test_file_wal.py b/Tests/test_file_wal.py index 13b1e3a2f..baa174f75 100644 --- a/Tests/test_file_wal.py +++ b/Tests/test_file_wal.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import WalImageFile diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py index a79ae8d9f..fe29f868c 100644 --- a/Tests/test_file_webp.py +++ b/Tests/test_file_webp.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, WebPImagePlugin diff --git a/Tests/test_file_webp_alpha.py b/Tests/test_file_webp_alpha.py index 85682e382..df01ff180 100644 --- a/Tests/test_file_webp_alpha.py +++ b/Tests/test_file_webp_alpha.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image diff --git a/Tests/test_file_webp_animated.py b/Tests/test_file_webp_animated.py index 6b3dc1622..4a940a83d 100644 --- a/Tests/test_file_webp_animated.py +++ b/Tests/test_file_webp_animated.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image diff --git a/Tests/test_file_webp_lossless.py b/Tests/test_file_webp_lossless.py index 4d9eff7f1..c682de02e 100644 --- a/Tests/test_file_webp_lossless.py +++ b/Tests/test_file_webp_lossless.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image diff --git a/Tests/test_file_webp_metadata.py b/Tests/test_file_webp_metadata.py index c04443f46..aab312f61 100644 --- a/Tests/test_file_webp_metadata.py +++ b/Tests/test_file_webp_metadata.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image diff --git a/Tests/test_file_wmf.py b/Tests/test_file_wmf.py index 1a15a514f..5659b40d7 100644 --- a/Tests/test_file_wmf.py +++ b/Tests/test_file_wmf.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image from PIL import WmfImagePlugin diff --git a/Tests/test_file_xbm.py b/Tests/test_file_xbm.py index 398dae98c..83843b2d7 100644 --- a/Tests/test_file_xbm.py +++ b/Tests/test_file_xbm.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image diff --git a/Tests/test_file_xpm.py b/Tests/test_file_xpm.py index 4fa3f743f..0ab919a2b 100644 --- a/Tests/test_file_xpm.py +++ b/Tests/test_file_xpm.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, XpmImagePlugin diff --git a/Tests/test_file_xvthumb.py b/Tests/test_file_xvthumb.py index d0256cabf..7f3ae2626 100644 --- a/Tests/test_file_xvthumb.py +++ b/Tests/test_file_xvthumb.py @@ -1,4 +1,4 @@ -from helper import hopper, unittest, PillowTestCase +from .helper import hopper, unittest, PillowTestCase from PIL import Image, XVThumbImagePlugin diff --git a/Tests/test_font_bdf.py b/Tests/test_font_bdf.py index 7c8fe579e..665778031 100644 --- a/Tests/test_font_bdf.py +++ b/Tests/test_font_bdf.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import FontFile, BdfFontFile diff --git a/Tests/test_font_leaks.py b/Tests/test_font_leaks.py index f1ce44e6d..68bbd7220 100644 --- a/Tests/test_font_leaks.py +++ b/Tests/test_font_leaks.py @@ -1,5 +1,5 @@ from __future__ import division -from helper import unittest, PillowLeakTestCase +from .helper import unittest, PillowLeakTestCase import sys from PIL import Image, features, ImageDraw, ImageFont diff --git a/Tests/test_font_pcf.py b/Tests/test_font_pcf.py index 20869505f..fa3f31b73 100644 --- a/Tests/test_font_pcf.py +++ b/Tests/test_font_pcf.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image, FontFile, PcfFontFile from PIL import ImageFont, ImageDraw diff --git a/Tests/test_format_hsv.py b/Tests/test_format_hsv.py index 0385bd66f..8211170a3 100644 --- a/Tests/test_format_hsv.py +++ b/Tests/test_format_hsv.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image from PIL._util import py3 diff --git a/Tests/test_format_lab.py b/Tests/test_format_lab.py index a243afe62..611adcb94 100644 --- a/Tests/test_format_lab.py +++ b/Tests/test_format_lab.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image diff --git a/Tests/test_image.py b/Tests/test_image.py index 9618e1427..427c6d878 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image from PIL._util import py3 diff --git a/Tests/test_image_access.py b/Tests/test_image_access.py index 481ec5935..90344d363 100644 --- a/Tests/test_image_access.py +++ b/Tests/test_image_access.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper, on_appveyor +from .helper import unittest, PillowTestCase, hopper, on_appveyor from PIL import Image import sys diff --git a/Tests/test_image_array.py b/Tests/test_image_array.py index 7a86a3e54..609c69142 100644 --- a/Tests/test_image_array.py +++ b/Tests/test_image_array.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image diff --git a/Tests/test_image_convert.py b/Tests/test_image_convert.py index e57ae4305..7123cb0a0 100644 --- a/Tests/test_image_convert.py +++ b/Tests/test_image_convert.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image diff --git a/Tests/test_image_copy.py b/Tests/test_image_copy.py index bb1246a73..0224036b0 100644 --- a/Tests/test_image_copy.py +++ b/Tests/test_image_copy.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image diff --git a/Tests/test_image_crop.py b/Tests/test_image_crop.py index fe92dd865..d3a30f954 100644 --- a/Tests/test_image_crop.py +++ b/Tests/test_image_crop.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image diff --git a/Tests/test_image_draft.py b/Tests/test_image_draft.py index 18982fc99..1ce118346 100644 --- a/Tests/test_image_draft.py +++ b/Tests/test_image_draft.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, fromstring, tostring +from .helper import unittest, PillowTestCase, fromstring, tostring from PIL import Image diff --git a/Tests/test_image_filter.py b/Tests/test_image_filter.py index 5e732b345..e33d4dbf5 100644 --- a/Tests/test_image_filter.py +++ b/Tests/test_image_filter.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, ImageFilter diff --git a/Tests/test_image_frombytes.py b/Tests/test_image_frombytes.py index 2d48bb6b8..f758b9ce4 100644 --- a/Tests/test_image_frombytes.py +++ b/Tests/test_image_frombytes.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image diff --git a/Tests/test_image_fromqimage.py b/Tests/test_image_fromqimage.py index 2e5d95aa7..1a5ddd42a 100644 --- a/Tests/test_image_fromqimage.py +++ b/Tests/test_image_fromqimage.py @@ -1,5 +1,5 @@ -from helper import unittest, PillowTestCase, hopper -from test_imageqt import PillowQtTestCase +from .helper import unittest, PillowTestCase, hopper +from .test_imageqt import PillowQtTestCase from PIL import ImageQt, Image diff --git a/Tests/test_image_getbands.py b/Tests/test_image_getbands.py index 5eecbf044..dfc882693 100644 --- a/Tests/test_image_getbands.py +++ b/Tests/test_image_getbands.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image diff --git a/Tests/test_image_getbbox.py b/Tests/test_image_getbbox.py index f29032143..a30695a13 100644 --- a/Tests/test_image_getbbox.py +++ b/Tests/test_image_getbbox.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image diff --git a/Tests/test_image_getcolors.py b/Tests/test_image_getcolors.py index ca7a9d93d..6bfb0b399 100644 --- a/Tests/test_image_getcolors.py +++ b/Tests/test_image_getcolors.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper class TestImageGetColors(PillowTestCase): diff --git a/Tests/test_image_getdata.py b/Tests/test_image_getdata.py index de502065b..07f7ecf53 100644 --- a/Tests/test_image_getdata.py +++ b/Tests/test_image_getdata.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper class TestImageGetData(PillowTestCase): diff --git a/Tests/test_image_getextrema.py b/Tests/test_image_getextrema.py index f002419da..db72cdf16 100644 --- a/Tests/test_image_getextrema.py +++ b/Tests/test_image_getextrema.py @@ -1,5 +1,5 @@ from PIL import Image -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper class TestImageGetExtrema(PillowTestCase): diff --git a/Tests/test_image_getim.py b/Tests/test_image_getim.py index 1452e584e..bacec54e7 100644 --- a/Tests/test_image_getim.py +++ b/Tests/test_image_getim.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL._util import py3 diff --git a/Tests/test_image_getpalette.py b/Tests/test_image_getpalette.py index 01a6ac7ad..0fd996f03 100644 --- a/Tests/test_image_getpalette.py +++ b/Tests/test_image_getpalette.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper class TestImageGetPalette(PillowTestCase): diff --git a/Tests/test_image_getprojection.py b/Tests/test_image_getprojection.py index 9d3f2d9ed..6623c841b 100644 --- a/Tests/test_image_getprojection.py +++ b/Tests/test_image_getprojection.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image diff --git a/Tests/test_image_histogram.py b/Tests/test_image_histogram.py index 892e89328..4a7a2a4ac 100644 --- a/Tests/test_image_histogram.py +++ b/Tests/test_image_histogram.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper class TestImageHistogram(PillowTestCase): diff --git a/Tests/test_image_load.py b/Tests/test_image_load.py index 88b6e9b5c..bd82654b1 100644 --- a/Tests/test_image_load.py +++ b/Tests/test_image_load.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image diff --git a/Tests/test_image_mode.py b/Tests/test_image_mode.py index 0596af397..3a8a6ad40 100644 --- a/Tests/test_image_mode.py +++ b/Tests/test_image_mode.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image diff --git a/Tests/test_image_paste.py b/Tests/test_image_paste.py index e782008a7..c4654c361 100644 --- a/Tests/test_image_paste.py +++ b/Tests/test_image_paste.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, cached_property +from .helper import unittest, PillowTestCase, cached_property from PIL import Image diff --git a/Tests/test_image_point.py b/Tests/test_image_point.py index 977e98e83..4a457708f 100644 --- a/Tests/test_image_point.py +++ b/Tests/test_image_point.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper class TestImagePoint(PillowTestCase): diff --git a/Tests/test_image_putalpha.py b/Tests/test_image_putalpha.py index 823e0612f..1c9280e5c 100644 --- a/Tests/test_image_putalpha.py +++ b/Tests/test_image_putalpha.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image diff --git a/Tests/test_image_putdata.py b/Tests/test_image_putdata.py index 2008c1307..435a16b47 100644 --- a/Tests/test_image_putdata.py +++ b/Tests/test_image_putdata.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from array import array import sys diff --git a/Tests/test_image_putpalette.py b/Tests/test_image_putpalette.py index e173f0000..5bc5f1444 100644 --- a/Tests/test_image_putpalette.py +++ b/Tests/test_image_putpalette.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import ImagePalette diff --git a/Tests/test_image_quantize.py b/Tests/test_image_quantize.py index 5b10d2de3..a48448f5f 100644 --- a/Tests/test_image_quantize.py +++ b/Tests/test_image_quantize.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image diff --git a/Tests/test_image_resample.py b/Tests/test_image_resample.py index 46a45833e..24c7e0f53 100644 --- a/Tests/test_image_resample.py +++ b/Tests/test_image_resample.py @@ -2,7 +2,7 @@ from __future__ import division, print_function from contextlib import contextmanager -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, ImageDraw diff --git a/Tests/test_image_resize.py b/Tests/test_image_resize.py index 535f1d77e..3fdaad6db 100644 --- a/Tests/test_image_resize.py +++ b/Tests/test_image_resize.py @@ -3,7 +3,7 @@ Tests for resize functionality. """ from itertools import permutations -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image diff --git a/Tests/test_image_rotate.py b/Tests/test_image_rotate.py index e788e722f..47cceb988 100644 --- a/Tests/test_image_rotate.py +++ b/Tests/test_image_rotate.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image diff --git a/Tests/test_image_split.py b/Tests/test_image_split.py index 6f312ff80..2f9bc7727 100644 --- a/Tests/test_image_split.py +++ b/Tests/test_image_split.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image diff --git a/Tests/test_image_thumbnail.py b/Tests/test_image_thumbnail.py index 6b92dbb24..e697dd273 100644 --- a/Tests/test_image_thumbnail.py +++ b/Tests/test_image_thumbnail.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper class TestImageThumbnail(PillowTestCase): diff --git a/Tests/test_image_tobitmap.py b/Tests/test_image_tobitmap.py index f93fce6a8..2b8bd8b20 100644 --- a/Tests/test_image_tobitmap.py +++ b/Tests/test_image_tobitmap.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper, fromstring +from .helper import unittest, PillowTestCase, hopper, fromstring class TestImageToBitmap(PillowTestCase): diff --git a/Tests/test_image_tobytes.py b/Tests/test_image_tobytes.py index f5a738695..909c4fdfc 100644 --- a/Tests/test_image_tobytes.py +++ b/Tests/test_image_tobytes.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper class TestImageToBytes(PillowTestCase): diff --git a/Tests/test_image_transform.py b/Tests/test_image_transform.py index 313e7ad09..76fcc333f 100644 --- a/Tests/test_image_transform.py +++ b/Tests/test_image_transform.py @@ -1,6 +1,6 @@ import math -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image diff --git a/Tests/test_image_transpose.py b/Tests/test_image_transpose.py index a6b1191db..1cd4beaad 100644 --- a/Tests/test_image_transpose.py +++ b/Tests/test_image_transpose.py @@ -1,5 +1,5 @@ -import helper -from helper import unittest, PillowTestCase +from . import helper +from .helper import unittest, PillowTestCase from PIL.Image import (FLIP_LEFT_RIGHT, FLIP_TOP_BOTTOM, ROTATE_90, ROTATE_180, ROTATE_270, TRANSPOSE, TRANSVERSE) diff --git a/Tests/test_imagechops.py b/Tests/test_imagechops.py index 06febc6d2..91ff8c94d 100644 --- a/Tests/test_imagechops.py +++ b/Tests/test_imagechops.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image from PIL import ImageChops diff --git a/Tests/test_imagecms.py b/Tests/test_imagecms.py index b4d53a2df..789481e55 100644 --- a/Tests/test_imagecms.py +++ b/Tests/test_imagecms.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper import datetime from PIL import Image, ImageMode diff --git a/Tests/test_imagecolor.py b/Tests/test_imagecolor.py index 1ea37544b..b1a4ea2f3 100644 --- a/Tests/test_imagecolor.py +++ b/Tests/test_imagecolor.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image from PIL import ImageColor diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py index 7f2accdcb..01b606460 100644 --- a/Tests/test_imagedraw.py +++ b/Tests/test_imagedraw.py @@ -1,6 +1,6 @@ import os.path -from helper import PillowTestCase, hopper, unittest +from .helper import PillowTestCase, hopper, unittest from PIL import Image, ImageColor, ImageDraw BLACK = (0, 0, 0) diff --git a/Tests/test_imagedraw2.py b/Tests/test_imagedraw2.py index c5faeb616..acb3b8c0c 100644 --- a/Tests/test_imagedraw2.py +++ b/Tests/test_imagedraw2.py @@ -1,6 +1,6 @@ import os.path -from helper import PillowTestCase, hopper, unittest +from .helper import PillowTestCase, hopper, unittest from PIL import Image, ImageDraw2, features BLACK = (0, 0, 0) diff --git a/Tests/test_imageenhance.py b/Tests/test_imageenhance.py index 54288f4db..308a9abb1 100644 --- a/Tests/test_imageenhance.py +++ b/Tests/test_imageenhance.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image from PIL import ImageEnhance diff --git a/Tests/test_imagefile.py b/Tests/test_imagefile.py index 4f81df12e..f3419541f 100644 --- a/Tests/test_imagefile.py +++ b/Tests/test_imagefile.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper, fromstring, tostring +from .helper import unittest, PillowTestCase, hopper, fromstring, tostring from io import BytesIO diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py index 82108638c..41530a587 100644 --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image, ImageDraw, ImageFont, features from io import BytesIO diff --git a/Tests/test_imagefont_bitmap.py b/Tests/test_imagefont_bitmap.py index 8376728a2..ba4c7fa6b 100644 --- a/Tests/test_imagefont_bitmap.py +++ b/Tests/test_imagefont_bitmap.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image, ImageFont, ImageDraw diff --git a/Tests/test_imagefontctl.py b/Tests/test_imagefontctl.py index 04432b14f..b518ad820 100644 --- a/Tests/test_imagefontctl.py +++ b/Tests/test_imagefontctl.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image, ImageDraw, ImageFont, features diff --git a/Tests/test_imagegrab.py b/Tests/test_imagegrab.py index 10e150fc4..6aef5d255 100644 --- a/Tests/test_imagegrab.py +++ b/Tests/test_imagegrab.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase import sys import subprocess diff --git a/Tests/test_imagemath.py b/Tests/test_imagemath.py index efbc91787..be7d3db78 100644 --- a/Tests/test_imagemath.py +++ b/Tests/test_imagemath.py @@ -1,5 +1,5 @@ from __future__ import print_function -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image from PIL import ImageMath diff --git a/Tests/test_imagemorph.py b/Tests/test_imagemorph.py index dceadebf4..a628a4718 100644 --- a/Tests/test_imagemorph.py +++ b/Tests/test_imagemorph.py @@ -1,5 +1,5 @@ # Test the ImageMorphology functionality -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, ImageMorph, _imagingmorph diff --git a/Tests/test_imageops.py b/Tests/test_imageops.py index 70b1659d9..2f0a4c720 100644 --- a/Tests/test_imageops.py +++ b/Tests/test_imageops.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import ImageOps from PIL import Image diff --git a/Tests/test_imageops_usm.py b/Tests/test_imageops_usm.py index 20758e9f8..86c270b35 100644 --- a/Tests/test_imageops_usm.py +++ b/Tests/test_imageops_usm.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image from PIL import ImageOps diff --git a/Tests/test_imagepalette.py b/Tests/test_imagepalette.py index 3b7087d7a..d9da3bb34 100644 --- a/Tests/test_imagepalette.py +++ b/Tests/test_imagepalette.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import ImagePalette, Image diff --git a/Tests/test_imagepath.py b/Tests/test_imagepath.py index 8df71121d..8539de309 100644 --- a/Tests/test_imagepath.py +++ b/Tests/test_imagepath.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import ImagePath, Image from PIL._util import py3 diff --git a/Tests/test_imageqt.py b/Tests/test_imageqt.py index cecb1b5ee..8ed32cdc1 100644 --- a/Tests/test_imageqt.py +++ b/Tests/test_imageqt.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import ImageQt diff --git a/Tests/test_imagesequence.py b/Tests/test_imagesequence.py index 500a2e60a..e9be42873 100644 --- a/Tests/test_imagesequence.py +++ b/Tests/test_imagesequence.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, ImageSequence, TiffImagePlugin diff --git a/Tests/test_imageshow.py b/Tests/test_imageshow.py index 244c18d91..ea784a52c 100644 --- a/Tests/test_imageshow.py +++ b/Tests/test_imageshow.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image from PIL import ImageShow diff --git a/Tests/test_imagestat.py b/Tests/test_imagestat.py index 77eb0aac1..282700c53 100644 --- a/Tests/test_imagestat.py +++ b/Tests/test_imagestat.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image from PIL import ImageStat diff --git a/Tests/test_imagetk.py b/Tests/test_imagetk.py index 667d18e8f..6e5dda9b3 100644 --- a/Tests/test_imagetk.py +++ b/Tests/test_imagetk.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image from PIL._util import py3 diff --git a/Tests/test_imagewin.py b/Tests/test_imagewin.py index 70bf28247..54d061063 100644 --- a/Tests/test_imagewin.py +++ b/Tests/test_imagewin.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import ImageWin import sys diff --git a/Tests/test_imagewin_pointers.py b/Tests/test_imagewin_pointers.py index dc78b655c..99416ae7c 100644 --- a/Tests/test_imagewin_pointers.py +++ b/Tests/test_imagewin_pointers.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image, ImageWin import sys diff --git a/Tests/test_lib_image.py b/Tests/test_lib_image.py index aefee2e08..466c43f88 100644 --- a/Tests/test_lib_image.py +++ b/Tests/test_lib_image.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image diff --git a/Tests/test_lib_pack.py b/Tests/test_lib_pack.py index 33590eeb4..999d88518 100644 --- a/Tests/test_lib_pack.py +++ b/Tests/test_lib_pack.py @@ -1,6 +1,6 @@ import sys -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image diff --git a/Tests/test_locale.py b/Tests/test_locale.py index 5aef8427b..b0721b651 100644 --- a/Tests/test_locale.py +++ b/Tests/test_locale.py @@ -1,5 +1,5 @@ from __future__ import print_function -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image diff --git a/Tests/test_map.py b/Tests/test_map.py index 8e3916d27..481e16924 100644 --- a/Tests/test_map.py +++ b/Tests/test_map.py @@ -1,4 +1,4 @@ -from helper import PillowTestCase, unittest +from .helper import PillowTestCase, unittest import sys from PIL import Image diff --git a/Tests/test_mode_i16.py b/Tests/test_mode_i16.py index d51847199..a65666562 100644 --- a/Tests/test_mode_i16.py +++ b/Tests/test_mode_i16.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import Image diff --git a/Tests/test_numpy.py b/Tests/test_numpy.py index 03643ac1e..4556cf859 100644 --- a/Tests/test_numpy.py +++ b/Tests/test_numpy.py @@ -1,6 +1,6 @@ from __future__ import print_function -from helper import PillowTestCase, hopper, unittest +from .helper import PillowTestCase, hopper, unittest from PIL import Image try: diff --git a/Tests/test_pdfparser.py b/Tests/test_pdfparser.py index ec849b17d..6100e1fd7 100644 --- a/Tests/test_pdfparser.py +++ b/Tests/test_pdfparser.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL.PdfParser import IndirectObjectDef, IndirectReference, PdfBinary, \ PdfDict, PdfFormatError, PdfName, PdfParser, \ diff --git a/Tests/test_pickle.py b/Tests/test_pickle.py index bdfd3582d..7cca1e3f9 100644 --- a/Tests/test_pickle.py +++ b/Tests/test_pickle.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image diff --git a/Tests/test_psdraw.py b/Tests/test_psdraw.py index 17fa3662b..54be98a39 100644 --- a/Tests/test_psdraw.py +++ b/Tests/test_psdraw.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import Image, PSDraw import os diff --git a/Tests/test_pyroma.py b/Tests/test_pyroma.py index 8d23d024b..6d3ee0b73 100644 --- a/Tests/test_pyroma.py +++ b/Tests/test_pyroma.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import __version__ diff --git a/Tests/test_qt_image_fromqpixmap.py b/Tests/test_qt_image_fromqpixmap.py index 0127f77e2..5242a0473 100644 --- a/Tests/test_qt_image_fromqpixmap.py +++ b/Tests/test_qt_image_fromqpixmap.py @@ -1,5 +1,5 @@ -from helper import unittest, PillowTestCase, hopper -from test_imageqt import PillowQPixmapTestCase +from .helper import unittest, PillowTestCase, hopper +from .test_imageqt import PillowQPixmapTestCase from PIL import ImageQt diff --git a/Tests/test_qt_image_toqimage.py b/Tests/test_qt_image_toqimage.py index 25391e09a..bc472eaa4 100644 --- a/Tests/test_qt_image_toqimage.py +++ b/Tests/test_qt_image_toqimage.py @@ -1,5 +1,5 @@ -from helper import unittest, PillowTestCase, hopper -from test_imageqt import PillowQtTestCase +from .helper import unittest, PillowTestCase, hopper +from .test_imageqt import PillowQtTestCase from PIL import ImageQt, Image diff --git a/Tests/test_qt_image_toqpixmap.py b/Tests/test_qt_image_toqpixmap.py index 5de7810f5..faeb272e2 100644 --- a/Tests/test_qt_image_toqpixmap.py +++ b/Tests/test_qt_image_toqpixmap.py @@ -1,5 +1,5 @@ -from helper import unittest, PillowTestCase, hopper -from test_imageqt import PillowQPixmapTestCase +from .helper import unittest, PillowTestCase, hopper +from .test_imageqt import PillowQPixmapTestCase from PIL import ImageQt diff --git a/Tests/test_shell_injection.py b/Tests/test_shell_injection.py index 9e489f77c..6aba626d1 100644 --- a/Tests/test_shell_injection.py +++ b/Tests/test_shell_injection.py @@ -1,5 +1,5 @@ -from helper import unittest, PillowTestCase -from helper import djpeg_available, cjpeg_available, netpbm_available +from .helper import unittest, PillowTestCase +from .helper import djpeg_available, cjpeg_available, netpbm_available import sys import shutil diff --git a/Tests/test_tiff_ifdrational.py b/Tests/test_tiff_ifdrational.py index bd767b931..1ee8f973c 100644 --- a/Tests/test_tiff_ifdrational.py +++ b/Tests/test_tiff_ifdrational.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper from PIL import TiffImagePlugin, Image from PIL.TiffImagePlugin import IFDRational diff --git a/Tests/test_uploader.py b/Tests/test_uploader.py index e157867cb..e8506ff96 100644 --- a/Tests/test_uploader.py +++ b/Tests/test_uploader.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase, hopper +from .helper import unittest, PillowTestCase, hopper class TestUploader(PillowTestCase): diff --git a/Tests/test_util.py b/Tests/test_util.py index 2316d3d65..69ab47966 100644 --- a/Tests/test_util.py +++ b/Tests/test_util.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowTestCase +from .helper import unittest, PillowTestCase from PIL import _util diff --git a/Tests/test_webp_leaks.py b/Tests/test_webp_leaks.py index c542ed811..79344f5f3 100644 --- a/Tests/test_webp_leaks.py +++ b/Tests/test_webp_leaks.py @@ -1,4 +1,4 @@ -from helper import unittest, PillowLeakTestCase +from .helper import unittest, PillowLeakTestCase from PIL import Image, features from io import BytesIO diff --git a/setup.cfg b/setup.cfg index 95900ff99..bcaf82f27 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,8 +4,5 @@ test=pytest [metadata] license_file = LICENSE -[tool:pytest] -addopts = -vx Tests - [flake8] max-line-length = 88 diff --git a/tox.ini b/tox.ini index 3ae11eea0..e282b8dbc 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ commands = {envpython} setup.py clean {envpython} setup.py build_ext --inplace {envpython} selftest.py - {envpython} -m pytest -qq {posargs} + {envpython} -m pytest {posargs} deps = cffi numpy