Linted and reduced file size

Author: makermelissa

adafruit_pyportal/__init__.py

@@ -182,11 +182,21 @@ def __init__(
             debug=debug,
         )
 
-        self.peripherals = Peripherals(spi, display=self.display, debug=debug)
+        # Convenience Shortcuts for compatibility
+        self.peripherals = Peripherals(
+            spi, display=self.display, splash_group=self.splash, debug=debug
+        )
         self.set_backlight = self.peripherals.set_backlight
         self.sd_check = self.peripherals.sd_check
         self.play_file = self.peripherals.play_file
 
+        self.image_converter_url = self.network.image_converter_url
+        self.wget = self.network.wget
+        # pylint: disable=invalid-name
+        self.show_QR = self.graphics.qrcode
+        self.hide_QR = self.graphics.hide_QR
+        # pylint: enable=invalid-name
+
         if hasattr(self.peripherals, "touchscreen"):
             self.touchscreen = self.peripherals.touchscreen
         if hasattr(self.peripherals, "mouse_cursor"):
@@ -288,22 +298,6 @@ def set_caption(self, caption_text, caption_position, caption_color):
         )
         self.set_text(caption_text, index)
 
-    def image_converter_url(self, image_url, width, height, color_depth=16):
-        """Generate a converted image url from the url passed in,
-        with the given width and height. aio_username and aio_key must be
-        set in secrets."""
-        return self.network.image_converter_url(image_url, width, height, color_depth)
-
-    def wget(self, url, filename, *, chunk_size=12000):
-        """Download a url and save to filename location, like the command wget.
-
-        :param url: The URL from which to obtain the data.
-        :param filename: The name of the file to save the data to.
-        :param chunk_size: how much data to read/write at a time.
-
-        """
-        return self.network.wget(url, filename, chunk_size=chunk_size)
-
     def fetch(self, refresh_url=None, timeout=10):
         """Fetch data from the url we initialized with, perfom any parsing,
         and display text or graphics. This function does pretty much everything
@@ -368,27 +362,3 @@ def fetch(self, refresh_url=None, timeout=10):
         gc.collect()
 
         return values
-
-    def show_QR(
-        self, qr_data, *, qr_size=1, x=0, y=0, hide_background=False
-    ):  # pylint: disable=invalid-name
-        """Display a QR code on the TFT
-
-        :param qr_data: The data for the QR code.
-        :param int qr_size: The scale of the QR code.
-        :param x: The x position of upper left corner of the QR code on the display.
-        :param y: The y position of upper left corner of the QR code on the display.
-        :param hide_background: Show the QR code on a black background if True.
-
-        """
-        self.graphics.qrcode(
-            qr_data,
-            qr_size=qr_size,
-            x=x,
-            y=y,
-            hide_background=hide_background,
-        )
-
-    def hide_QR(self):  # pylint: disable=invalid-name
-        """Clear any QR codes that are currently on the screen"""
-        self.graphics.hide_qrcode()

adafruit_pyportal/peripherals.py

@@ -49,7 +49,7 @@ class Peripherals:
     """Peripherals Helper Class for the PyPortal Library"""
 
     # pylint: disable=too-many-instance-attributes, too-many-locals, too-many-branches, too-many-statements
-    def __init__(self, spi, display, debug=False):
+    def __init__(self, spi, display, splash_group, debug=False):
         # Speaker Enable
         self._speaker_enable = DigitalInOut(board.SPEAKER_ENABLE)
         self._speaker_enable.switch_to_output(False)
@@ -89,7 +89,7 @@ def __init__(self, spi, display, debug=False):
         except ValueError:
             self._backlight = None
         self.set_backlight(1.0)  # turn on backlight
-
+        # pylint: disable=import-outside-toplevel
         if hasattr(board, "TOUCH_XL"):
             import adafruit_touchscreen
 
@@ -114,14 +114,15 @@ def __init__(self, spi, display, debug=False):
             if debug:
                 print("Init cursor")
             self.mouse_cursor = Cursor(
-                board.DISPLAY, display_group=self.splash, cursor_speed=8
+                board.DISPLAY, display_group=splash_group, cursor_speed=8
             )
             self.mouse_cursor.hide()
             self.cursor = CursorManager(self.mouse_cursor)
         else:
             raise AttributeError(
                 "PyPortal module requires either a touchscreen or gamepad."
             )
+        # pylint: enable=import-outside-toplevel
 
         gc.collect()