From f94b6b4025e3ed7ab46841fd3f253d5244ff7162 Mon Sep 17 00:00:00 2001
From: Alexey Buzanov <a.buzanov@corp.mail.ru>
Date: Wed, 20 Aug 2014 10:32:06 +0400
Subject: [PATCH] flake8 and tests

---
 PIL/TgaImagePlugin.py         |  25 +++++++++++++------------
 Tests/images/tga_id_field.tga | Bin 0 -> 30050 bytes
 Tests/test_file_tga.py        |  22 ++++++++++++++++++++++
 3 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 Tests/images/tga_id_field.tga
 create mode 100644 Tests/test_file_tga.py

diff --git a/PIL/TgaImagePlugin.py b/PIL/TgaImagePlugin.py
index 049fb2dbb..46eafe8d0 100644
--- a/PIL/TgaImagePlugin.py
+++ b/PIL/TgaImagePlugin.py
@@ -19,7 +19,6 @@
 
 __version__ = "0.3"
 
-import os
 from PIL import Image, ImageFile, ImagePalette, _binary
 
 
@@ -77,7 +76,7 @@ class TgaImageFile(ImageFile.ImageFile):
         if imagetype in (3, 11):
             self.mode = "L"
             if depth == 1:
-                self.mode = "1" # ???
+                self.mode = "1"  # ???
         elif imagetype in (1, 9):
             self.mode = "P"
         elif imagetype in (2, 10):
@@ -102,24 +101,24 @@ class TgaImageFile(ImageFile.ImageFile):
             self.info["compression"] = "tga_rle"
 
         if idlen:
-            self.fp.seek(idlen, os.SEEK_CUR)
+            self.info["id_section"] = self.fp.read(idlen)
 
         if colormaptype:
             # read palette
             start, size, mapdepth = i16(s[3:]), i16(s[5:]), i16(s[7:])
             if mapdepth == 16:
-                self.palette = ImagePalette.raw("BGR;16",
-                    b"\0"*2*start + self.fp.read(2*size))
+                self.palette = ImagePalette.raw(
+                    "BGR;16", b"\0"*2*start + self.fp.read(2*size))
             elif mapdepth == 24:
-                self.palette = ImagePalette.raw("BGR",
-                    b"\0"*3*start + self.fp.read(3*size))
+                self.palette = ImagePalette.raw(
+                    "BGR", b"\0"*3*start + self.fp.read(3*size))
             elif mapdepth == 32:
-                self.palette = ImagePalette.raw("BGRA",
-                    b"\0"*4*start + self.fp.read(4*size))
+                self.palette = ImagePalette.raw(
+                    "BGRA", b"\0"*4*start + self.fp.read(4*size))
 
         # setup tile descriptor
         try:
-            rawmode = MODES[(imagetype&7, depth)]
+            rawmode = MODES[(imagetype & 7, depth)]
             if imagetype & 8:
                 # compressed
                 self.tile = [("tga_rle", (0, 0)+self.size,
@@ -128,7 +127,7 @@ class TgaImageFile(ImageFile.ImageFile):
                 self.tile = [("raw", (0, 0)+self.size,
                               self.fp.tell(), (rawmode, 0, orientation))]
         except KeyError:
-            pass # cannot decode
+            pass  # cannot decode
 
 #
 # --------------------------------------------------------------------
@@ -146,6 +145,7 @@ SAVE = {
     "RGBA": ("BGRA", 32, 0, 2),
 }
 
+
 def _save(im, fp, filename, check=0):
 
     try:
@@ -186,7 +186,8 @@ def _save(im, fp, filename, check=0):
     if colormaptype:
         fp.write(im.im.getpalette("RGB", "BGR"))
 
-    ImageFile._save(im, fp, [("raw", (0,0)+im.size, 0, (rawmode, 0, orientation))])
+    ImageFile._save(
+        im, fp, [("raw", (0, 0) + im.size, 0, (rawmode, 0, orientation))])
 
 #
 # --------------------------------------------------------------------
diff --git a/Tests/images/tga_id_field.tga b/Tests/images/tga_id_field.tga
new file mode 100644
index 0000000000000000000000000000000000000000..a3d666848d1833725ed3078782a676bcaa44bc0e
GIT binary patch
literal 30050
zcmeI)F-ikL6b9hM!ZX;X)*GaZ5D*1d#a0R125fSJ+#n~&1#*BKU=NT!efre;<KVJo
z3So==rdZy-oiJ}c-Yh9XuB)r+Z!D@sbyGFV<>$xOw?Tja0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zATYGR>2#V-r<2KKv)R;jz1!^$heK}n`+dnLC^cq6`45SvX@;(PnDw{YZ3IHJTCEZU
zDkDL-j>ltp8qX5MEphV0)H?L4*?u8PA$_a!`CLj%cLgfFl)f6e*x}a?MY<?ZeXFjl
z986Z7MrolOuD(@>k}v16ZQJ#F9nZ|^J~hrD2svmO@rgk32~IN6E6KR!80I#~%pWII
z*>zsmAu4gPN}Mk0lKpAjtE?o)eC@2pjBw%J(_^Fk26Z8kX#@xmAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7csf&UW7Z=`?6%k%5(ZC=lx9&g|8=MS^H
F>IX^pF_8cO

literal 0
HcmV?d00001

diff --git a/Tests/test_file_tga.py b/Tests/test_file_tga.py
new file mode 100644
index 000000000..6affba780
--- /dev/null
+++ b/Tests/test_file_tga.py
@@ -0,0 +1,22 @@
+from helper import unittest, PillowTestCase
+
+from PIL import Image
+
+
+class TestFileSun(PillowTestCase):
+
+    def test_sanity(self):
+        # tga file with id field
+        test_file = "Tests/images/tga_id_field.tga"
+
+        # Act
+        im = Image.open(test_file)
+
+        # Assert
+        self.assertEqual(im.size, (100, 100))
+
+
+if __name__ == '__main__':
+    unittest.main()
+
+# End of file