remove 8.x compatibility. use strings for types to avoid circular import

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

diff --git a/displayio/__init__.py b/displayio/__init__.py
index c0d35a3f033f274df9b5bf22ebdee16b745aca2e..9e9d97741db91c70320b3e397067f503347aaee3 100644 (file)
--- a/displayio/__init__.py
+++ b/displayio/__init__.py
@@ -19,10 +19,6 @@ displayio for Blinka
 import threading
 from typing import Union
 
 import threading
 from typing import Union
 

-import fourwire
-from busdisplay import BusDisplay
-from busdisplay._displaybus import _DisplayBus
-from epaperdisplay import EPaperDisplay

 from ._bitmap import Bitmap
 from ._colorspace import Colorspace
 from ._colorconverter import ColorConverter
 from ._bitmap import Bitmap
 from ._colorspace import Colorspace
 from ._colorconverter import ColorConverter


@@ -32,10 +28,6 @@ from ._palette import Palette
 from ._tilegrid import TileGrid
 from ._constants import CIRCUITPY_DISPLAY_LIMIT
 
 from ._tilegrid import TileGrid
 from ._constants import CIRCUITPY_DISPLAY_LIMIT
 

-# 8.x Backwards compatibility, remove at 10.x or
-# when compatibility is removed from core displayio
-Display = BusDisplay
-FourWire = fourwire.FourWire

 
 __version__ = "0.0.0+auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 __version__ = "0.0.0+auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"


@@ -67,14 +59,16 @@ def release_displays() -> None:
     display_buses.clear()
 
 
     display_buses.clear()
 
 

-def allocate_display(new_display: Union[BusDisplay, EPaperDisplay]) -> None:
+def allocate_display(
+    new_display: Union["busdisplay.BusDisplay", "epaperdisplay.EPaperDisplay"]
+) -> None:

     """Add a display to the displays pool and return the new display"""
     if len(displays) >= CIRCUITPY_DISPLAY_LIMIT:
         raise RuntimeError("Too many displays")
     displays.append(new_display)
 
 
     """Add a display to the displays pool and return the new display"""
     if len(displays) >= CIRCUITPY_DISPLAY_LIMIT:
         raise RuntimeError("Too many displays")
     displays.append(new_display)
 
 

-def allocate_display_bus(new_display_bus: _DisplayBus) -> None:
+def allocate_display_bus(new_display_bus: "busdisplay._displaybus._DisplayBus") -> None:

     """Add a display bus to the display_buses pool and return the new display bus"""
     if len(display_buses) >= CIRCUITPY_DISPLAY_LIMIT:
         raise RuntimeError(
     """Add a display bus to the display_buses pool and return the new display bus"""
     if len(display_buses) >= CIRCUITPY_DISPLAY_LIMIT:
         raise RuntimeError(