From c3a4107452c0158f9b9118bb3438730e49e55c7b Mon Sep 17 00:00:00 2001 From: andreamah Date: Tue, 21 Apr 2020 21:42:31 +0000 Subject: [PATCH 1/2] fixed import error in linux --- src/base_circuitpython/displayio/group.py | 2 +- src/debug_user_code.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/base_circuitpython/displayio/group.py b/src/base_circuitpython/displayio/group.py index c5dccf90a..5acc1f2a8 100644 --- a/src/base_circuitpython/displayio/group.py +++ b/src/base_circuitpython/displayio/group.py @@ -3,7 +3,7 @@ from PIL import Image import adafruit_display_text -from .tile_grid import TileGrid +from displayio.tile_grid import TileGrid from . import constants as CONSTANTS import common diff --git a/src/debug_user_code.py b/src/debug_user_code.py index 8be4792fb..a1ad6cb16 100644 --- a/src/debug_user_code.py +++ b/src/debug_user_code.py @@ -32,12 +32,12 @@ # Insert absolute path to Circuitpython libraries for CLUE into sys.path sys.path.insert(0, os.path.join(abs_path_to_parent_dir, CONSTANTS.CIRCUITPYTHON)) -# get board so we can get terminal handle -import board - # This import must happen after the sys.path is modified from common import debugger_communication_client +# get board so we can get terminal handle +import board + # get handle to terminal for clue curr_terminal = board.DISPLAY.terminal From 6a742d362fa4e01e503a2a1a1db0b6962a68daf5 Mon Sep 17 00:00:00 2001 From: andreamah Date: Tue, 21 Apr 2020 15:06:22 -0700 Subject: [PATCH 2/2] fixed tests --- src/base_circuitpython/displayio/test/test_group.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/base_circuitpython/displayio/test/test_group.py b/src/base_circuitpython/displayio/test/test_group.py index 4d943ffc8..3e4b3601e 100644 --- a/src/base_circuitpython/displayio/test/test_group.py +++ b/src/base_circuitpython/displayio/test/test_group.py @@ -7,10 +7,10 @@ from common import utils -from ..tile_grid import TileGrid -from ..group import Group -from ..palette import Palette -from ..bitmap import Bitmap +from displayio.tile_grid import TileGrid +from displayio.group import Group +from displayio.palette import Palette +from displayio.bitmap import Bitmap from .. import constants as CONSTANTS from PIL import Image