Apply suggestions from code review

Co-authored-by: Andrew Murray <[email protected]>

src/PIL/IcnsImagePlugin.py

@@ -391,8 +391,8 @@ def _accept(prefix):
     with open(sys.argv[1], "rb") as fp:
         imf = IcnsImageFile(fp)
         for size in imf.info["sizes"]:
-            w, h, x = imf.size = size
-            imf.save(f"out-{w}-{h}-{x}.png")
+            width, height, scale = imf.size = size
+            imf.save(f"out-{width}-{height}-{scale}.png")
         with Image.open(sys.argv[1]) as im:
             im.save("out.png")
         if sys.platform == "windows":

src/PIL/Image.py

@@ -3100,8 +3100,8 @@ def fromarray(obj, mode=None):
         try:
             mode, rawmode = _fromarray_typemap[typekey]
         except KeyError as e:
-            typ_shape, typ_type = typekey
-            msg = f"Cannot handle this data type: {typ_shape}, {typ_type}"
+            typekey_shape, typestr = typekey
+            msg = f"Cannot handle this data type: {typekey_shape}, {typestr}"
             raise TypeError(msg) from e
     else:
         rawmode = mode