Commit Graph

120 Commits

Author SHA1 Message Date
Konstantin Kopachev
06e34db10b
Merge remote-tracking branch 'upstream/master' into exif-writing-fixes
# Conflicts:
#	Tests/test_file_tiff_metadata.py
2019-08-29 09:20:09 -07:00
Andrew Murray
ddcfd259cf Corrected short and long range checks 2019-08-29 19:36:46 +10:00
Andrew Murray
35a7d11f43 Fixed typo [ci skip] 2019-08-29 19:02:19 +10:00
Andrew Murray
f08a0966a0 Corrected tag counts 2019-08-19 21:12:16 +10:00
Konstantin Kopachev
1b626f4d22 Fix RATIONAL and SRATIONAL boundaries when writing IFDs 2019-08-12 19:43:35 +10:00
Jon Dufresne
d50445ff30 Introduce isort to automate import ordering and formatting
Similar to the recent adoption of Black. isort is a Python utility to
sort imports alphabetically and automatically separate into sections. By
using isort, contributors can quickly and automatically conform to the
projects style without thinking. Just let the tool do it.

Uses the configuration recommended by the Black to avoid conflicts of
style.

Rewrite TestImageQt.test_deprecated to no rely on import order.
2019-07-06 16:11:35 -07:00
Hugo
f87821e010 Format with Black 2019-06-13 18:54:11 +03:00
Jon Dufresne
4de5477b61 Remove unnecessary unittest.main() boilerplate from test files
With the introduction and use of pytest, it is simple and easy to
execute specific tests in isolation through documented command line
arguments. Either by specifying the module path or through the `-k
EXPRESSION` argument. There is no longer any need to provide the
boilerplate:

    if __name__ == '__main__':
        unittest.main()

To every test file. It is simply noise.

The pattern remains in test files that aren't named with `test_*` as
those files are not discovered and executed by pytest by default.
2019-02-03 10:10:16 -08:00
Jon Dufresne
7da17ad41e 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.
2019-01-13 09:00:12 -08:00
Andrew Murray
990fb03218 Changed if to elif 2018-11-12 06:14:04 +11:00
Hugo
088d04470e Unnecessary list comprehension - 'tuple' can take a generator 2018-10-24 22:29:56 +03:00
Andrew Murray
a8261a2e89 Line too long 2018-09-27 20:35:00 +10:00
Jon Dufresne
875e8c4bda Avoid catching unexpected exceptions in tests
Instead, allow exceptions to bubble up to the unittest exception
handler.

Prevents replacing the exception trace with a less informative
message. As the exceptions are always unexpected, should not need to
catch them explicitly in tests.
2018-09-04 19:43:20 -07:00
Andrew Murray
c13ccf13a1 Added missing whitespace 2018-03-06 19:53:07 +11:00
Andrew Murray
2202196162 Flake8 blank line fixes 2018-03-04 21:36:33 +11:00
Metallicow
5e94cd0fc2 Trim trailing whitespace tests dir 2018-01-27 00:07:24 -06:00
Eric Soroos
c12b9fb4dc added test for metadata count warning 2017-09-19 10:35:14 +00:00
Eric Soroos
56e490fe7c Test for issue #2278 2017-09-14 20:05:13 +01:00
Eric Soroos
843f8b2a6b Test for ImageJMetaDataByteCounts, #2006 2017-09-14 20:05:13 +01:00
Eric Soroos
83c57a8063 Specific change for issue #2006, ImageJ Metadata counts are incorrect in TiffTags 2017-09-14 20:05:13 +01:00
Eric Soroos
488691bda4 General fix for issue #2278, #2006, ValueError with out of spec metadata 2017-09-14 20:05:13 +01:00
Andrew Murray
9e843a2d9b Changed format of lambda calls 2017-09-01 21:05:40 +10:00
Andrew Murray
b82151f281 Removed unused division import 2017-01-18 20:06:47 +11:00
Jon Dufresne
dbe9f85c7d Drop support for Python 2.6
* Drop unittest2 requirement
* Use set literals
* Use dict/set comprehension
* Use str.format() automatic numbering
2016-11-22 04:23:55 -08:00
Jon Dufresne
e44bb42ae9 Replace type() equality checks with isinstance 2016-10-31 06:41:43 -07:00
wiredfool
4a90e8f75b Merge pull request #2024 from uploadcare/fix-empty-exif-tags
Skip empty values in ImageFileDirectory
2016-09-29 08:24:44 -07:00
homm
7a4847f457 all literals are bytes 2016-07-12 22:54:15 +03:00
homm
107307dfc9 do not use as_dict anywhere in tests except tests for as_dict warnings 2016-07-12 21:34:15 +03:00
homm
c2b4ff5fa4 skip empty values in ImageFileDirectory 2016-07-12 18:09:02 +03:00
homm
1ba4e9e5ba remove end of file banner from all files 2016-07-10 14:11:28 +03:00
wiredfool
a64c1674a1 Tests for issue #1462, #1834, #1831, #1910 2016-06-26 12:05:05 +01:00
wiredfool
1e2a27f00d Fixed broken test re: https://github.com/python-pillow/Pillow/issues/1462#issuecomment-210487186 2016-06-26 12:02:45 +01:00
Andrew Murray
677b958a7f Health fixes 2016-04-01 21:49:30 +11:00
wiredfool
3ac9396e8c Write round trip for rationals, including nan value 2015-12-29 22:00:36 +00:00
wiredfool
3dd4b39411 Namespace 2015-12-29 21:33:10 +00:00
wiredfool
5e7a5bf237 Limit rationals for expected values in round trip 2015-12-29 21:33:10 +00:00
wiredfool
8ed2d1ed02 Changing the type of the target values 2015-12-27 20:48:47 +00:00
wiredfool
deecbcd3a3 Added a rational class for TiffIFD that allows for 0/0 2015-12-27 10:21:31 +00:00
Andrew Murray
afa4166a57 Updated deprecated asserts 2015-12-16 14:30:17 +11:00
Andrew Murray
c27110ab56 Flake8 fixes 2015-12-10 21:34:02 +11:00
wiredfool
f8a5ded0d6 Test for #1526, load binary tagged iccprofile 2015-11-15 16:41:49 +00:00
wiredfool
5e670e9b70 using test file with known license 2015-10-03 17:04:40 -07:00
wiredfool
157df44e51 Add tag info for iccprofile, fixes #1462 2015-10-03 16:35:53 +01:00
homm
9930b05a33 fix tiff exif loading in case when file is empty or ended 2015-09-15 04:06:51 +03:00
wiredfool
4596df45c1 Versioned interface for TiffTags 2015-09-13 15:15:13 +01:00
wiredfool
2636679868 updating tests for legacy_api api change 2015-09-13 14:08:49 +01:00
wiredfool
0c35194167 rewrite of #1416 working 2015-09-12 10:11:10 +01:00
wiredfool
b1fdff4034 In a twisty maze of bytes, text and arbitrary metadata, py2 and py3. New IFD is putting textdata in type7 metadata and returning bytes, old one put it in type 2 string and returned a string. This may be an issue 2015-09-11 23:44:23 +01:00
wiredfool
426c9d8fc2 test failing update 2015-09-11 22:40:38 +01:00
Antony Lee
93abbd0caa Restore legacy TIFF API.
To have the old API that always returns tuples, and fractions as pairs,
set the `legacy_api` attribute of the IFD to True.

This should alleviate concerns about backwards compatibility.
2015-09-11 22:39:37 +01:00
Antony Lee
38f7e23495 Include tests of #1113. 2015-09-11 22:35:58 +01:00
Antony Lee
d5b46dce96 Fix MPO support, and Python2.6 support. 2015-09-11 22:34:50 +01:00
Antony Lee
974bcc074b Major rewrite of TIFF ImageFileDirectory.
Do not represent scalar tags as 1-element tuples.  Keep tag
type and count information in TiffTags.TAGS.  Normalize data in
ImageFileDirectory.__setitem__: wrap and unwrap tuples as needed,
convert rationals to floats.  (To ensure consistency, make the "tags"
attribute private.)  Interpret byte data as a series of integers rather
than a bytearray (which should only map to the "undefined" type).  On
Python3, if a str is assigned to an "undefined" tag, encode it as ASCII.

Note that a large number of tags have been removed from TiffTags.TAGS
because I do not have time to figure out the type and count of each of
them.  They should be restored before this gets merged in.

This obviously breaks backwards compatibility in a lot of ways...
2015-09-11 22:34:50 +01:00
Bogdan Kubala
42b5a85cb4 Fix for UnicodeDecodeError in TiffImagePlugin
Fix for UnicodeDecodeError: ascii codec cannot decode byte while saving a TIFF image

Problem occured while saving TIFF images that contain non-ascii characters in metadata

Manually merged with master by wiredfool
2015-09-10 07:57:47 -07:00
Andrew Murray
d1c182cadc Various Flake8 fixes 2015-04-24 09:26:52 +10:00
Björn Pedersen
47f5c9e650 Fix float precission 2015-02-23 12:11:20 +01:00
Björn Pedersen
e8553e1dae Tiff float tags: Use first val in tuple 2015-02-23 12:06:29 +01:00
Björn Pedersen
0238a80e24 Fix test failure on float
due to rounding, the values are just 'almost' equal.
2015-02-23 11:19:32 +01:00
Björn Pedersen
1f11fc7be5 Fix typo in test 2015-02-23 11:09:01 +01:00
Björn Pedersen
31be9f12ad Add tests for tiff float tag values
Add tests for writing of float/double values in tiff file tags.
2015-02-23 10:52:27 +01:00
Hugo
c0ce691704 Remove trailing L, not needed for Py2 and errors in Py3 2014-09-23 10:40:03 +03:00
Hugo
5957f5c812 Replace lena_g4.tif with hopper_g4.tif 2014-09-23 10:30:55 +03:00
hugovk
eb458c7c8f Replace lena.tif with hopper.tif (created with ImageMagick) 2014-09-05 12:14:45 +03:00
hugovk
952d1d5bf5 Remove duplicate tag caused by typo in spec: http://www.asmail.be/msg0055321032.html 2014-08-26 15:51:37 +03:00
hugovk
cf04a9a0d2 Remove unused tearDownModule 2014-07-07 20:03:50 +03:00
hugovk
3ec505958e Convert old tests to use unittest 2014-06-10 12:10:47 +03:00
hugovk
c9a4272af6 Replace python-imaging with python-pillow (but yet not Coveralls) 2014-06-03 13:02:44 +03:00
wiredfool
a91283061e Python3 fixes 2013-10-07 23:30:55 -07:00
wiredfool
350cc702f1 Additional tests for reading and writing Tiff ImageFileDirectories 2013-10-07 23:01:15 -07:00
wiredfool
dbf47837ce Add arbitrary tags to tiff images using an ImageFileDirectory 2013-10-02 22:06:17 -07:00