Merge ba4c14aeac into e56c3e4d2a

PIL/ImagePalette.py

@@ -98,7 +98,8 @@ class ImagePalette(object):
             except KeyError:
                 # allocate new color slot
                 if isinstance(self.palette, bytes):
-                    self.palette = [int(x) for x in self.palette]
+                    self.palette = [(ord(x) if str is bytes else int(x))
+                                    for x in self.palette]
                 index = len(self.colors)
                 if index >= 256:
                     raise ValueError("cannot allocate more than 256 colors")

Tests/test_imagedraw.py

@@ -52,6 +52,13 @@ class TestImageDraw(PillowTestCase):
         self.assertRaises(Exception, lambda: draw.setink(0))
         self.assertRaises(Exception, lambda: draw.setfill(0))
 
+    def test_valueerror(self):
+        im = Image.open("Tests/images/chi.gif")
+
+        draw = ImageDraw.Draw(im)
+        draw.line(((0, 0)), fill=(0, 0, 0))
+        del draw
+
     def test_mode_mismatch(self):
         im = hopper("RGB").copy()