optimize

Author: Matt Land

adafruit_imageload/pnm/__init__.py

@@ -39,12 +39,10 @@ def load(file, header, *, bitmap=None, palette=None):
     file.seek(2)
     pnm_header = []
     while True:
-        # We have all we need at length 3
+        # We have all we need at length 3 for formats P2, P3, P5, P6
         if len(pnm_header) == 3:
             break
-        if len(pnm_header) == 2 and (
-            magic_number.startswith(b"P1") or magic_number.startswith(b"P4")
-        ):
+        if len(pnm_header) == 2 and magic_number in [b"P1",  b"P4"]:
             bitmap = bitmap(pnm_header[0], pnm_header[1], 1)
             if palette:
                 palette = palette(1)
@@ -86,19 +84,23 @@ def load(file, header, *, bitmap=None, palette=None):
         if not next_byte:
             raise RuntimeError("Unsupported image format")
 
-    if magic_number.startswith(b"P2") or magic_number.startswith(b"P5"):
+    if magic_number in [b"P2", b"P5"]:
         from . import pgm
 
         return pgm.load(file, magic_number, pnm_header, bitmap=bitmap, palette=palette)
 
-    if magic_number.startswith(b"P3"):
+    if magic_number == b"P3":
         from . import ppm_ascii
 
-        return ppm_ascii.load(file, pnm_header[0], pnm_header[1], bitmap=bitmap, palette=palette)
+        return ppm_ascii.load(
+            file, pnm_header[0], pnm_header[1], bitmap=bitmap, palette=palette
+        )
 
-    if magic_number.startswith(b"P6"):
+    if magic_number == b"P6":
         from . import ppm_binary
 
-        return ppm_binary.load(file, pnm_header[0], pnm_header[1], bitmap=bitmap, palette=palette)
+        return ppm_binary.load(
+            file, pnm_header[0], pnm_header[1], bitmap=bitmap, palette=palette
+        )
 
     raise RuntimeError("Unsupported image format {}".format(magic_number))

adafruit_imageload/pnm/pbm_ascii.py

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 """
-`adafruit_imageload.pnm.pbm.ascii`
+`adafruit_imageload.pnm.pbm_ascii`
 ====================================================
 
 Load pixel values (indices or colors) into a bitmap and for an ascii ppm,

adafruit_imageload/pnm/pbm_binary.py

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 """
-`adafruit_imageload.pnm.pbm.binary`
+`adafruit_imageload.pnm.pbm_binary`
 ====================================================
 
 Load pixel values (indices or colors) into a bitmap and for an ascii ppm,

adafruit_imageload/pnm/pgm/__init__.py

@@ -37,7 +37,7 @@ def load(file, magic_number, header, *, bitmap=None, palette=None):
     :param magic_number: string P2 or P6
     :param header: list of width, height, max color value
     :param bitmap: displayio.Bitmap class object
-    :param palette: displayio.Paletta class object
+    :param palette: displayio.Palette class object
     :return:
     """
     if header[2] > 256:
@@ -53,7 +53,7 @@ def load(file, magic_number, header, *, bitmap=None, palette=None):
         # build a set of all colors present in the file, so palette and bitmap can be constructed
         while True:
             byte = file.read(1)
-            if byte == b'':
+            if byte == b"":
                 break
             if not byte.isdigit():
                 int_pixel = int("".join(["%c" % char for char in pixel]))
@@ -81,7 +81,7 @@ def load(file, magic_number, header, *, bitmap=None, palette=None):
     if magic_number == b"P5":  # To handle binary PGM files.
         while True:
             byte = file.read(1)
-            if byte == b'':
+            if byte == b"":
                 break
             int_pixel = int.from_bytes(byte, "little")
             palette_colors.add(int_pixel)
@@ -108,4 +108,4 @@ def build_palette(palette_class, palette_colors):
     palette = palette_class(len(palette_colors))
     for counter, color in enumerate(palette_colors):
         palette[counter] = bytes([color, color, color])
-    return palette
+    return palette

adafruit_imageload/pnm/ppm_ascii.py

@@ -52,7 +52,7 @@ def load(file, width, height, bitmap=None, palette=None):
     while True:  # scan for all colors present in the file
         # read values from file, values can be string len 1-3 for values 0 - 255
         this_byte = file.read(1)
-        if this_byte == b'':
+        if this_byte == b"":
             break
         if not this_byte.isdigit():  # completed one number
             triplet.append(int("".join(["%c" % char for char in color])))

adafruit_imageload/pnm/ppm_binary.py

@@ -63,7 +63,7 @@ def load(file, width, height, bitmap=None, palette=None):
             for red in data_line:
                 green = next(data_line)
                 blue = next(data_line)
-                bitmap[x,y] = palette_colors.index((red, green, blue))
+                bitmap[x, y] = palette_colors.index((red, green, blue))
                 x += 1
 
     return bitmap, palette

adafruit_imageload/tests/test_bitmap_c_interface.py

@@ -2,7 +2,7 @@
 from .displayio_shared_bindings import Bitmap_C_Interface
 
 
-class TestBitmap_C(TestCase):
+class TestBitmap_C_Interface(TestCase):
     def test_init(self):
         b = Bitmap_C_Interface(2, 4, 1)
         self.assertEqual(2, b.width)

adafruit_imageload/tests/test_pbm_load.py

@@ -58,12 +58,16 @@ def test_load_works_p4_binary(self):
             "netpbm_p4_mono_binary.pbm",
         )
         with open(test_file, "rb") as f:
-            bitmap, palette = pnm.load(f, b"P4", bitmap=Bitmap_C_Interface)
+            bitmap, palette = pnm.load(
+                f, b"P4", bitmap=Bitmap_C_Interface, palette=Palette_C_Interface
+            )
         self.assertTrue(isinstance(bitmap, Bitmap_C_Interface))
         self.assertEqual(1, bitmap.colors)
         self.assertEqual(32, bitmap.width)
         self.assertEqual(15, bitmap.height)
         bitmap.validate()
+        self.assertEqual(1, palette.num_colors)
+        palette.validate()
 
     def test_load_works_p4_binary_high_res(self):
         test_file = os.path.join(
@@ -75,8 +79,13 @@ def test_load_works_p4_binary_high_res(self):
             "netpbm_p4_mono_large.pbm",
         )
         with open(test_file, "rb") as f:
-            bitmap, palette = pnm.load(f, b"P4", bitmap=Bitmap_C_Interface)
+            bitmap, palette = pnm.load(
+                f, b"P4", bitmap=Bitmap_C_Interface, palette=Palette_C_Interface
+            )
         self.assertTrue(isinstance(bitmap, Bitmap_C_Interface))
         self.assertEqual(1, bitmap.colors)
         self.assertEqual(320, bitmap.width)
         self.assertEqual(240, bitmap.height)
+        bitmap.validate()
+        self.assertEqual(1, palette.num_colors)
+        palette.validate()

adafruit_imageload/tests/test_ppm_load.py

@@ -1,11 +1,8 @@
 import os
-import logging
 from unittest import TestCase
 from adafruit_imageload import pnm
 from .displayio_shared_bindings import Bitmap_C_Interface, Palette_C_Interface
 
-logging.getLogger().setLevel(logging.INFO)
-
 
 class TestPpmLoad(TestCase):
     def test_load_works_p3_ascii(self):
@@ -24,13 +21,13 @@ def test_load_works_p3_ascii(self):
 
         self.assertTrue(isinstance(palette, Palette_C_Interface))
         self.assertEqual(6, palette.num_colors)
-        #self.fail(str(palette))
+        palette.validate()
+        # self.fail(str(palette))
         self.assertTrue(isinstance(bitmap, Bitmap_C_Interface), bitmap)
         self.assertEqual(6, bitmap.colors)
         self.assertEqual(16, bitmap.width)
         self.assertEqual(16, bitmap.height)
         bitmap.validate()
-        palette.validate()
 
     def test_load_works_p6_binary(self):
         test_file = os.path.join(
@@ -45,10 +42,10 @@ def test_load_works_p6_binary(self):
             bitmap, palette = pnm.load(
                 f, b"P6", bitmap=Bitmap_C_Interface, palette=Palette_C_Interface
             )
+        self.assertEqual(6, palette.num_colors)
+        palette.validate()
         self.assertTrue(isinstance(bitmap, Bitmap_C_Interface), bitmap)
         self.assertEqual(6, bitmap.colors)
         self.assertEqual(16, bitmap.width)
         self.assertEqual(16, bitmap.height)
         bitmap.validate()
-        str(bitmap)
-        palette.validate()