Fixed icns tools.

Author: jyapayne

icns_info.py

@@ -669,12 +669,12 @@ def dump(self):
         values = []
         for field in self._fields:
             val = getattr(self, field.name)
-            if not isinstance(val, basestring):
+            if not isinstance(val, (str, bytes)):
                 values.append(val)
                 s += struct_symbols[field.size]
             else:
                 s += 'B'*len(val)
-                values.extend(struct.unpack('>'+'B'*len(val), val))
+                values.extend(struct.unpack('>'+'B'*len(val), bytearray(val, encoding='utf-8')))
 
 
         return struct.pack(s, *values)
@@ -984,7 +984,7 @@ def parse_image(self, image):
         for icon_s in icon_sizes:
             icns_element = ICNSElement()
 
-            im_data = image_utils.resize(image, (icon_s, icon_s))
+            im_data = image_utils.resize(image, (int(icon_s), int(icon_s)))
 
             png_file = png.Reader(bytes=im_data)
 

image_utils.py

@@ -9,9 +9,9 @@ def resize(image, size):
         image.thumbnail(size, im.ANTIALIAS)
         offset = [0,0]
         if image.size[0] >= image.size[1]:
-            offset[1] = back.size[1]/2-image.size[1]/2
+            offset[1] = int(back.size[1]/2-image.size[1]/2)
         else:
-            offset[0] = back.size[0]/2-image.size[0]/2
+            offset[0] = int(back.size[0]/2-image.size[0]/2)
         back.paste(image, tuple(offset))
         back.save(output, image.format)
         contents = output.getvalue()