Merge pull request #129 from makermelissa/main

[hackapet/Adafruit_Blinka_Displayio.git] / displayio / _display.py

diff --git a/displayio/_display.py b/displayio/_display.py
index a3da5c5a031a83729806dc7f3a0f6365e9d4d0a4..9e720541fb9787093b56bf0a024e6655ccec7bb1 100644 (file)
--- a/displayio/_display.py
+++ b/displayio/_display.py
@@ -212,7 +212,7 @@ class Display:
                 # 100Hz looks decent and doesn't keep the CPU too busy
                 self._backlight = PWMOut(backlight_pin, frequency=100, duty_cycle=0)
                 self._backlight_type = BACKLIGHT_PWM
                 # 100Hz looks decent and doesn't keep the CPU too busy
                 self._backlight = PWMOut(backlight_pin, frequency=100, duty_cycle=0)
                 self._backlight_type = BACKLIGHT_PWM

-            except ImportError:
+            except (ImportError, NotImplementedError):

                 # PWMOut not implemented on this platform
                 pass
             if self._backlight_type is None:
                 # PWMOut not implemented on this platform
                 pass
             if self._backlight_type is None:


@@ -245,7 +245,7 @@ class Display:
     def show(self, group: Group) -> None:
         """
         .. note:: `show()` is deprecated and will be removed when CircuitPython 9.0.0
     def show(self, group: Group) -> None:
         """
         .. note:: `show()` is deprecated and will be removed when CircuitPython 9.0.0

-        is released. Use ``.root_group = group`` instead.
+          is released. Use ``.root_group = group`` instead.

 
         Switches to displaying the given group of layers. When group is None, the
         default CircuitPython terminal will be shown.
 
         Switches to displaying the given group of layers. When group is None, the
         default CircuitPython terminal will be shown.


@@ -534,10 +534,12 @@ class Display:
 
     @property
     def root_group(self) -> Group:
 
     @property
     def root_group(self) -> Group:

-        """The root group on the display.
+        """
+        The root group on the display.

         If the root group is set to `displayio.CIRCUITPYTHON_TERMINAL`, the default
         CircuitPython terminal will be shown.
         If the root group is set to `displayio.CIRCUITPYTHON_TERMINAL`, the default
         CircuitPython terminal will be shown.

-        If the root group is set to ``None``, no output will be shown."""
+        If the root group is set to ``None``, no output will be shown.
+        """

         return self._core.current_group
 
     @root_group.setter
         return self._core.current_group
 
     @root_group.setter