Add Python 3.2 support

MANIFEST.in

@@ -8,6 +8,10 @@ include *.rst
 include *.c
 include *.h
 include selftest.py tox.ini
+recursive-include Tests *.py *.txt
+graft Tests/fonts
+graft Tests/icc
+graft Tests/images
 recursive-include Scripts *.py README
 graft Images
 recursive-include docs *.txt *.html *.rst *.css *.py README CHANGES CONTENTS Makefile make.bat

PIL/ArgImagePlugin.py

@@ -18,13 +18,15 @@
 # See the README file for information on usage and redistribution.
 #
 
+from __future__ import print_function
+
 __version__ = "0.4"
 
-import Image, ImageFile, ImagePalette
+from . import Image, ImageFile, ImagePalette
 
-from PngImagePlugin import i16, i32, ChunkStream, _MODES
+from .PngImagePlugin import i8, i16, i32, ChunkStream, _MODES
 
-MAGIC = "\212ARG\r\n\032\n"
+MAGIC = b"\212ARG\r\n\032\n"
 
 # --------------------------------------------------------------------
 # ARG parser
@@ -60,18 +62,18 @@ def chunk_AHDR(self, offset, bytes):
 
         # assertions
         if self.count != 0:
-            raise SyntaxError, "misplaced AHDR chunk"
+            raise SyntaxError("misplaced AHDR chunk")
 
         s = self.fp.read(bytes)
         self.size = i32(s), i32(s[4:])
         try:
-            self.mode, self.rawmode = _MODES[(ord(s[8]), ord(s[9]))]
+            self.mode, self.rawmode = _MODES[(i8(s[8]), i8(s[9]))]
         except:
-            raise SyntaxError, "unknown ARG mode"
+            raise SyntaxError("unknown ARG mode")
 
         if Image.DEBUG:
-            print "AHDR size", self.size
-            print "AHDR mode", self.mode, self.rawmode
+            print("AHDR size", self.size)
+            print("AHDR mode", self.mode, self.rawmode)
 
         return s
 
@@ -80,7 +82,7 @@ def chunk_AFRM(self, offset, bytes):
 
         # assertions
         if self.count != 0:
-            raise SyntaxError, "misplaced AFRM chunk"
+            raise SyntaxError("misplaced AFRM chunk")
 
         self.show = 1
         self.id = 0
@@ -98,7 +100,7 @@ def chunk_AFRM(self, offset, bytes):
                     self.repair = None
 
         if Image.DEBUG:
-            print "AFRM", self.id, self.count
+            print("AFRM", self.id, self.count)
 
         return s
 
@@ -107,7 +109,7 @@ def chunk_ADEF(self, offset, bytes):
 
         # assertions
         if self.count != 0:
-            raise SyntaxError, "misplaced ADEF chunk"
+            raise SyntaxError("misplaced ADEF chunk")
 
         self.show = 0
         self.id = 0
@@ -121,7 +123,7 @@ def chunk_ADEF(self, offset, bytes):
                 self.count = i16(s[2:4])
 
         if Image.DEBUG:
-            print "ADEF", self.id, self.count
+            print("ADEF", self.id, self.count)
 
         return s
 
@@ -130,7 +132,7 @@ def chunk_NAME(self, offset, bytes):
 
         # assertions
         if self.count == 0:
-            raise SyntaxError, "misplaced NAME chunk"
+            raise SyntaxError("misplaced NAME chunk")
 
         name = self.fp.read(bytes)
         self.names[self.id] = name
@@ -141,26 +143,26 @@ def chunk_AEND(self, offset, bytes):
         "AEND -- end of animation"
 
         if Image.DEBUG:
-            print "AEND"
+            print("AEND")
 
         self.eof = 1
 
-        raise EOFError, "end of ARG file"
+        raise EOFError("end of ARG file")
 
     def __getmodesize(self, s, full=1):
 
         size = i32(s), i32(s[4:])
 
         try:
-            mode, rawmode = _MODES[(ord(s[8]), ord(s[9]))]
+            mode, rawmode = _MODES[(i8(s[8]), i8(s[9]))]
         except:
-            raise SyntaxError, "unknown image mode"
+            raise SyntaxError("unknown image mode")
 
         if full:
-            if ord(s[12]):
+            if i8(s[12]):
                 pass # interlace not yet supported
-            if ord(s[11]):
-                raise SyntaxError, "unknown filter category"
+            if i8(s[11]):
+                raise SyntaxError("unknown filter category")
 
         return size, mode, rawmode
 
@@ -169,7 +171,7 @@ def chunk_PAST(self, offset, bytes):
 
         # assertions
         if self.count == 0:
-            raise SyntaxError, "misplaced PAST chunk"
+            raise SyntaxError("misplaced PAST chunk")
 
         if self.repair is not None:
             # we must repair the target image before we
@@ -206,7 +208,7 @@ def chunk_BLNK(self, offset, bytes):
 
         # assertions
         if self.count == 0:
-            raise SyntaxError, "misplaced BLNK chunk"
+            raise SyntaxError("misplaced BLNK chunk")
 
         s = self.fp.read(bytes)
         size, mode, rawmode = self.__getmodesize(s, 0)
@@ -223,7 +225,7 @@ def chunk_IHDR(self, offset, bytes):
 
         # assertions
         if self.count == 0:
-            raise SyntaxError, "misplaced IHDR chunk"
+            raise SyntaxError("misplaced IHDR chunk")
 
         # image header
         s = self.fp.read(bytes)
@@ -234,7 +236,7 @@ def chunk_IHDR(self, offset, bytes):
         self.im = Image.core.new(mode, size)
         self.decoder = Image.core.zip_decoder(rawmode)
         self.decoder.setimage(self.im, (0,0) + size)
-        self.data = ""
+        self.data = b""
 
         return s
 
@@ -243,20 +245,20 @@ def chunk_DHDR(self, offset, bytes):
 
         # assertions
         if self.count == 0:
-            raise SyntaxError, "misplaced DHDR chunk"
+            raise SyntaxError("misplaced DHDR chunk")
 
         s = self.fp.read(bytes)
 
         size, mode, rawmode = self.__getmodesize(s)
 
         # delta header
-        diff = ord(s[13])
+        diff = i8(s[13])
         offs = i32(s[14:18]), i32(s[18:22])
 
         bbox = offs + (offs[0]+size[0], offs[1]+size[1])
 
         if Image.DEBUG:
-            print "DHDR", diff, bbox
+            print("DHDR", diff, bbox)
 
         # FIXME: decode and apply image
         self.action = ("DHDR", diff, bbox)
@@ -267,7 +269,7 @@ def chunk_DHDR(self, offset, bytes):
         self.decoder = Image.core.zip_decoder(rawmode)
         self.decoder.setimage(self.im, (0,0) + size)
 
-        self.data = ""
+        self.data = b""
 
         return s
 
@@ -276,7 +278,7 @@ def chunk_JHDR(self, offset, bytes):
 
         # assertions
         if self.count == 0:
-            raise SyntaxError, "misplaced JHDR chunk"
+            raise SyntaxError("misplaced JHDR chunk")
 
         # image header
         s = self.fp.read(bytes)
@@ -287,7 +289,7 @@ def chunk_JHDR(self, offset, bytes):
         self.im = Image.core.new(mode, size)
         self.decoder = Image.core.jpeg_decoder(rawmode)
         self.decoder.setimage(self.im, (0,0) + size)
-        self.data = ""
+        self.data = b""
 
         return s
 
@@ -296,7 +298,7 @@ def chunk_UHDR(self, offset, bytes):
 
         # assertions
         if self.count == 0:
-            raise SyntaxError, "misplaced UHDR chunk"
+            raise SyntaxError("misplaced UHDR chunk")
 
         # image header
         s = self.fp.read(bytes)
@@ -307,7 +309,7 @@ def chunk_UHDR(self, offset, bytes):
         self.im = Image.core.new(mode, size)
         self.decoder = Image.core.raw_decoder(rawmode)
         self.decoder.setimage(self.im, (0,0) + size)
-        self.data = ""
+        self.data = b""
 
         return s
 
@@ -321,7 +323,7 @@ def chunk_IDAT(self, offset, bytes):
         if n < 0:
             # end of image
             if e < 0:
-                raise IOError, "decoder error %d" % e
+                raise IOError("decoder error %d" % e)
         else:
             self.data = self.data[n:]
 
@@ -386,7 +388,7 @@ def chunk_sYNC(self, offset, bytes):
         "SYNC -- reset decoder"
 
         if self.count != 0:
-            raise SyntaxError, "misplaced sYNC chunk"
+            raise SyntaxError("misplaced sYNC chunk")
 
         s = self.fp.read(bytes)
         self.__reset()
@@ -418,7 +420,7 @@ def _open(self):
                 )
 
         if self.fp.read(8) != MAGIC:
-            raise SyntaxError, "not an ARG file"
+            raise SyntaxError("not an ARG file")
 
         self.arg = ArgStream(self.fp)
 
@@ -427,7 +429,7 @@ def _open(self):
         cid, offset, bytes = self.arg.read()
 
         if cid != "AHDR":
-            raise SyntaxError, "expected an AHDR chunk"
+            raise SyntaxError("expected an AHDR chunk")
 
         s = self.arg.call(cid, offset, bytes)
 
@@ -452,19 +454,19 @@ def load(self):
     def seek(self, frame):
 
         if self.arg.eof:
-            raise EOFError, "end of animation"
+            raise EOFError("end of animation")
 
         self.fp = self.arg.fp
 
-        while 1:
+        while True:
 
             #
             # process chunks
 
             cid, offset, bytes = self.arg.read()
 
             if self.arg.eof:
-                raise EOFError, "end of animation"
+                raise EOFError("end of animation")
 
             try:
                 s = self.arg.call(cid, offset, bytes)
@@ -473,7 +475,7 @@ def seek(self, frame):
 
             except "glurk": # AttributeError
                 if Image.DEBUG:
-                    print cid, bytes, "(unknown)"
+                    print(cid, bytes, "(unknown)")
                 s = self.fp.read(bytes)
 
             self.arg.crc(cid, s)