Merge pull request #7527 from akx/remove-commented-out-code

Author: hugovk

src/PIL/EpsImagePlugin.py

@@ -77,8 +77,6 @@ def Ghostscript(tile, size, fp, scale=1, transparency=False):
 
     # Hack to support hi-res rendering
     scale = int(scale) or 1
-    # orig_size = size
-    # orig_bbox = bbox
     size = (size[0] * scale, size[1] * scale)
     # resolution is dependent on bbox and size
     res = (

src/PIL/FitsImagePlugin.py

@@ -54,12 +54,10 @@ def _open(self):
             self._mode = "L"
         elif number_of_bits == 16:
             self._mode = "I"
-            # rawmode = "I;16S"
         elif number_of_bits == 32:
             self._mode = "I"
         elif number_of_bits in (-32, -64):
             self._mode = "F"
-            # rawmode = "F" if number_of_bits == -32 else "F;64F"
 
         offset = math.ceil(self.fp.tell() / 2880) * 2880
         self.tile = [("raw", (0, 0) + self.size, offset, (self.mode, 0, -1))]

src/PIL/FontFile.py

@@ -78,7 +78,6 @@ def compile(self):
             if glyph:
                 d, dst, src, im = glyph
                 xx = src[2] - src[0]
-                # yy = src[3] - src[1]
                 x0, y0 = x, y
                 x = x + xx
                 if x > WIDTH:

src/PIL/GifImagePlugin.py

@@ -281,14 +281,9 @@ def _seek(self, frame, update_image=True):
                 bits = self.fp.read(1)[0]
                 self.__offset = self.fp.tell()
                 break
-
-            else:
-                pass
-                # raise OSError, "illegal GIF tag `%x`" % s[0]
             s = None
 
         if interlace is None:
-            # self._fp = None
             msg = "image not found in GIF frame"
             raise EOFError(msg)
 

src/PIL/IcoImagePlugin.py

@@ -174,9 +174,7 @@ def __init__(self, buf):
 
         self.entry = sorted(self.entry, key=lambda x: x["color_depth"])
         # ICO images are usually squares
-        # self.entry = sorted(self.entry, key=lambda x: x['width'])
-        self.entry = sorted(self.entry, key=lambda x: x["square"])
-        self.entry.reverse()
+        self.entry = sorted(self.entry, key=lambda x: x["square"], reverse=True)
 
     def sizes(self):
         """

src/PIL/ImageFile.py

@@ -430,7 +430,6 @@ def feed(self, data):
                 with io.BytesIO(self.data) as fp:
                     im = Image.open(fp)
             except OSError:
-                # traceback.print_exc()
                 pass  # not enough data
             else:
                 flag = hasattr(im, "load_seek") or hasattr(im, "load_read")

src/PIL/ImagePalette.py

@@ -257,8 +257,6 @@ def load(filename):
                 if lut:
                     break
             except (SyntaxError, ValueError):
-                # import traceback
-                # traceback.print_exc()
                 pass
         else:
             msg = "cannot load palette"

src/PIL/ImageQt.py

@@ -83,16 +83,6 @@ def fromqimage(im):
 
 def fromqpixmap(im):
     return fromqimage(im)
-    # buffer = QBuffer()
-    # buffer.open(QIODevice.ReadWrite)
-    # # im.save(buffer)
-    # # What if png doesn't support some image features like animation?
-    # im.save(buffer, 'ppm')
-    # bytes_io = BytesIO()
-    # bytes_io.write(buffer.data())
-    # buffer.close()
-    # bytes_io.seek(0)
-    # return Image.open(bytes_io)
 
 
 def align8to32(bytes, width, mode):
@@ -208,9 +198,5 @@ def toqimage(im):
 
 
 def toqpixmap(im):
-    # # This doesn't work. For now using a dumb approach.
-    # im_data = _toqclass_helper(im)
-    # result = QPixmap(im_data["size"][0], im_data["size"][1])
-    # result.loadFromData(im_data["data"])
     qimage = toqimage(im)
     return QPixmap.fromImage(qimage)

src/PIL/MpoImagePlugin.py

@@ -33,9 +33,6 @@
 from ._binary import i16be as i16
 from ._binary import o32le
 
-# def _accept(prefix):
-#     return JpegImagePlugin._accept(prefix)
-
 
 def _save(im, fp, filename):
     JpegImagePlugin._save(im, fp, filename)

src/PIL/PpmImagePlugin.py

@@ -328,9 +328,6 @@ def _save(im, fp, filename):
             fp.write(b"65535\n")
     ImageFile._save(im, fp, [("raw", (0, 0) + im.size, 0, (rawmode, 0, 1))])
 
-    # ALTERNATIVE: save via builtin debug function
-    # im._dump(filename)
-
 
 #
 # --------------------------------------------------------------------