Merge branch 'master' into rm-deprecated-qt

CHANGES.rst

@@ -2,11 +2,38 @@
 Changelog (Pillow)
 ==================
 
-6.2.0 (unreleased)
+7.0.0 (unreleased)
+------------------
+
+- Removed deprecated PILLOW_VERSION #4107
+  [hugovk]
+
+- Changed default frombuffer raw decoder args #1730
+  [radarhere]
+
+6.2.0 (2019-10-01)
 ------------------
 
 - This is the last Pillow release to support Python 2.7 #3642
 
+- Catch buffer overruns #4104
+  [radarhere]
+
+- Initialize rows_per_strip when RowsPerStrip tag is missing #4034
+  [cgohlke, radarhere]
+
+- Raise error if TIFF dimension is a string #4103
+  [radarhere]
+
+- Added decompression bomb checks #4102
+  [radarhere]
+
+- Fix ImageGrab.grab DPI scaling on Windows 10 version 1607+ #4000
+  [nulano, radarhere]
+
+- Corrected negative seeks #4101
+  [radarhere]
+
 - Added argument to capture all screens on Windows #3950
   [nulano, radarhere]
 

RELEASING.md

@@ -92,7 +92,7 @@ Released as needed privately to individual vendors for critical security-related
   ```
 * [ ] Download distributions from the [Pillow Wheel Builder container](http://a365fff413fe338398b6-1c8a9b3114517dc5fe17b7c3f8c63a43.r19.cf2.rackcdn.com/).
   ```bash
-  wget -m -A 'Pillow-<VERSION>*' \
+  wget -m -A 'Pillow-<VERSION>-*' \
   http://a365fff413fe338398b6-1c8a9b3114517dc5fe17b7c3f8c63a43.r19.cf2.rackcdn.com
   ```
 

docs/deprecations.rst

@@ -83,14 +83,6 @@ a ``DeprecationWarning``:
     Setting the size of a TIFF image directly is deprecated, and will
     be removed in a future version. Use the resize method instead.
 
-PILLOW_VERSION constant
-~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 5.2.0
-
-``PILLOW_VERSION`` has been deprecated and will be removed in 7.0.0. Use ``__version__``
-instead.
-
 ImageCms.CmsProfile attributes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -117,6 +109,13 @@ Removed features
 Deprecated features are only removed in major releases after an appropriate
 period of deprecation has passed.
 
+PILLOW_VERSION constant
+~~~~~~~~~~~~~~~~~~~~~~~
+
+*Removed in version 7.0.0.*
+
+``PILLOW_VERSION`` has been removed. Use ``__version__`` instead.
+
 PyQt4 and PySide
 ~~~~~~~~~~~~~~~~
 

src/PIL/Image.py

@@ -35,9 +35,9 @@ import sys
 import warnings
 
 # VERSION was removed in Pillow 6.0.0.
-# PILLOW_VERSION is deprecated and will be removed in Pillow 7.0.0.
+# PILLOW_VERSION was removed in Pillow 7.0.0.
 # Use __version__ instead.
-from . import PILLOW_VERSION, ImageMode, TiffTags, __version__, _plugins
+from . import ImageMode, TiffTags, __version__, _plugins
 from ._binary import i8, i32le
 from ._util import deferred_error, isPath, isStringType, py3
 
@@ -57,9 +57,6 @@ except ImportError:
     from collections import Callable, MutableMapping
 
 
-# Silence warning
-assert PILLOW_VERSION
-
 logger = logging.getLogger(__name__)
 
 
@@ -2592,14 +2589,7 @@ def frombuffer(mode, size, data, decoder_name="raw", *args):
 
     if decoder_name == "raw":
         if args == ():
-            warnings.warn(
+            args = mode, 0, 1
-                "the frombuffer defaults will change in Pillow 7.0.0; "
-                "for portability, change the call to read:\n"
-                "  frombuffer(mode, size, data, 'raw', mode, 0, 1)",
-                RuntimeWarning,
-                stacklevel=2,
-            )
-            args = mode, 0, -1  # may change to (mode, 0, 1) post-1.1.6
         if args[0] in _MAPMODES:
             im = new(mode, (1, 1))
             im = im._new(core.map_buffer(data, size, decoder_name, None, 0, args))

src/PIL/TiffTags.py

@@ -120,7 +120,7 @@ TAGS_V2 = {
     277: ("SamplesPerPixel", SHORT, 1),
     278: ("RowsPerStrip", LONG, 1),
     279: ("StripByteCounts", LONG, 0),
-    280: ("MinSampleValue", LONG, 0),
+    280: ("MinSampleValue", SHORT, 0),
     281: ("MaxSampleValue", SHORT, 0),
     282: ("XResolution", RATIONAL, 1),
     283: ("YResolution", RATIONAL, 1),
@@ -182,7 +182,7 @@ TAGS_V2 = {
     # FIXME add more tags here
     34665: ("ExifIFD", LONG, 1),
     34675: ("ICCProfile", UNDEFINED, 1),
-    34853: ("GPSInfoIFD", BYTE, 1),
+    34853: ("GPSInfoIFD", LONG, 1),
     # MPInfo
     45056: ("MPFVersion", UNDEFINED, 1),
     45057: ("NumberOfImages", LONG, 1),

src/PIL/__init__.py

@@ -17,9 +17,9 @@ PIL.VERSION is the old PIL version and will be removed in the future.
 from . import _version
 
 # VERSION was removed in Pillow 6.0.0.
-# PILLOW_VERSION is deprecated and will be removed in Pillow 7.0.0.
+# PILLOW_VERSION was removed in Pillow 7.0.0.
 # Use __version__ instead.
-PILLOW_VERSION = __version__ = _version.__version__
+__version__ = _version.__version__
 
 del _version
 

src/PIL/_version.py

@@ -1,2 +1,2 @@
 # Master version for Pillow
-__version__ = "6.2.0.dev0"
+__version__ = "7.0.0.dev0"