Merge pull request #1435 from radarhere/tiff

Minor Tiff formatting changes

PIL/TiffImagePlugin.py

@@ -227,6 +227,7 @@ def _limit_rational(val, max_val):
 _load_dispatch = {}
 _write_dispatch = {}
 
+
 class ImageFileDirectory_v2(collections.MutableMapping):
     """This class represents a TIFF tag directory.  To speed things up, we
     don't decode tags unless they're asked for.
@@ -313,10 +314,10 @@ class ImageFileDirectory_v2(collections.MutableMapping):
         raise Exception("Not allowing setting of legacy api")
 
     def reset(self):
-        self._tags_v1 = {} # will remain empty if legacy_api is false
+        self._tags_v1 = {}  # will remain empty if legacy_api is false
-        self._tags_v2 = {} # main tag storage
+        self._tags_v2 = {}  # main tag storage
         self._tagdata = {}
-        self.tagtype = {}  # added 2008-06-05 by Florian Hoech
+        self.tagtype = {}   # added 2008-06-05 by Florian Hoech
         self._next = None
         self._offset = None
 
@@ -395,7 +396,7 @@ class ImageFileDirectory_v2(collections.MutableMapping):
                             self.tagtype[tag] = 2
 
         if self.tagtype[tag] == 7 and bytes is not str:
-            values = [value.encode("ascii",'replace') if isinstance(value, str) else value
+            values = [value.encode("ascii", 'replace') if isinstance(value, str) else value
                       for value in values]
 
         values = tuple(info.cvt_enum(value) for value in values)
@@ -453,12 +454,12 @@ class ImageFileDirectory_v2(collections.MutableMapping):
               (6, "b", "signed byte"), (8, "h", "signed short"),
               (9, "l", "signed long"), (11, "f", "float"), (12, "d", "double")]))
 
-    @_register_loader(1, 1) # Basic type, except for the legacy API.
+    @_register_loader(1, 1)  # Basic type, except for the legacy API.
     def load_byte(self, data, legacy_api=True):
         return (data if legacy_api else
                 tuple(map(ord, data) if bytes is str else data))
 
-    @_register_writer(1) # Basic type, except for the legacy API.
+    @_register_writer(1)  # Basic type, except for the legacy API.
     def write_byte(self, data):
         return data
 
@@ -472,7 +473,7 @@ class ImageFileDirectory_v2(collections.MutableMapping):
     def write_string(self, value):
         # remerge of https://github.com/python-pillow/Pillow/pull/1416
         if sys.version_info[0] == 2:
-           value = value.decode('ascii', 'replace')
+            value = value.decode('ascii', 'replace')
         return b"" + value.encode('ascii', 'replace') + b"\0"
 
     @_register_loader(5, 8)
@@ -521,8 +522,8 @@ class ImageFileDirectory_v2(collections.MutableMapping):
         self._offset = fp.tell()
 
         try:
-            for i in range(self._unpack("H", self._ensure_read(fp,2))[0]):
+            for i in range(self._unpack("H", self._ensure_read(fp, 2))[0]):
-                tag, typ, count, data = self._unpack("HHL4s", self._ensure_read(fp,12))
+                tag, typ, count, data = self._unpack("HHL4s", self._ensure_read(fp, 12))
                 if DEBUG:
                     tagname = TAGS_V2.get(tag, TagInfo()).name
                     typname = TYPES.get(typ, "unknown")
@@ -563,7 +564,7 @@ class ImageFileDirectory_v2(collections.MutableMapping):
                     else:
                         print("- value:", self[tag])
 
-            self.next, = self._unpack("L", self._ensure_read(fp,4))
+            self.next, = self._unpack("L", self._ensure_read(fp, 4))
         except IOError as msg:
             warnings.warn(str(msg))
             return
@@ -608,7 +609,7 @@ class ImageFileDirectory_v2(collections.MutableMapping):
                 entries.append((tag, typ, count, data.ljust(4, b"\0"), b""))
             else:
                 entries.append((tag, typ, count, self._pack("L", offset), data))
-                offset += (len(data) + 1) // 2 * 2 # pad to word
+                offset += (len(data) + 1) // 2 * 2  # pad to word
 
         # update strip offset data to point beyond auxiliary data
         if stripoffsets is not None:
@@ -644,9 +645,10 @@ for idx, name in TYPES.items():
     setattr(ImageFileDirectory_v2, "write_" + name, _write_dispatch[idx])
 del _load_dispatch, _write_dispatch, idx, name
 
-#Legacy ImageFileDirectory support.
+
+# Legacy ImageFileDirectory support.
 class ImageFileDirectory_v1(ImageFileDirectory_v2):
-    """This class represents the **legacy** interface to  a TIFF tag directory.
+    """This class represents the **legacy** interface to a TIFF tag directory.
 
     Exposes a dictionary interface of the tags in the directory::
 
@@ -665,8 +667,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2):
     """
     def __init__(self, *args, **kwargs):
         ImageFileDirectory_v2.__init__(self, *args, **kwargs)
-        self._legacy_api=True
+        self._legacy_api = True
-        #insert deprecation warning here.
 
     tags = property(lambda self: self._tags_v1)
     tagdata = property(lambda self: self._tagdata)
@@ -686,7 +687,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2):
         ifd = cls(prefix=original.prefix)
         ifd._tagdata = original._tagdata
         ifd.tagtype = original.tagtype
-        ifd.next = original.next # an indicator for multipage tiffs
+        ifd.next = original.next  # an indicator for multipage tiffs
         return ifd
 
     def to_v2(self):
@@ -716,7 +717,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2):
         return iter(set(self._tagdata) | set(self._tags_v1))
 
     def __setitem__(self, tag, value):
-        for legacy_api in (False,True):
+        for legacy_api in (False, True):
             self._setitem(tag, value, legacy_api)
 
     def __getitem__(self, tag):
@@ -735,6 +736,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2):
 # undone -- switch this pointer when IFD_LEGACY_API == False
 ImageFileDirectory = ImageFileDirectory_v1
 
+
 ##
 # Image plugin for TIFF files.
 

PIL/TiffTags.py

@@ -19,6 +19,7 @@
 
 from collections import namedtuple
 
+
 class TagInfo(namedtuple("_TagInfo", "value name type length enum")):
     __slots__ = []
 
@@ -278,7 +279,7 @@ TAGS = {347: 'JPEGTables',
         50740: 'DNGPrivateData',
         50778: 'CalibrationIlluminant1',
         50779: 'CalibrationIlluminant2',
-}
+        }
 
 
 def _populate():
@@ -312,4 +313,3 @@ TYPES = {}
 #     11: "float",
 #     12: "double",
 # }
-

docs/handbook/image-file-formats.rst

@@ -512,7 +512,7 @@ The :py:meth:`~PIL.Image.Image.save` method can take the following keyword argum
 
     For compatibility with legacy code, a
     `~PIL.TiffImagePlugin.ImageFileDirectory_v1` object may be passed
-    in this field. This will be deprecated in a future version. 
+    in this field. However, this is deprecated.
 
     ..versionadded:: 3.0.0