diff options
| author | Daniel Thompson <daniel@redfelineninja.org.uk> | 2020-05-10 08:33:26 (GMT) |
|---|---|---|
| committer | Daniel Thompson <daniel@redfelineninja.org.uk> | 2020-05-10 08:33:26 (GMT) |
| commit | a4c62bb8183b0416f1bc02f43e7d46c415eb21f9 (patch) | |
| tree | e65fc165b201b7d5ce9201f2dcce54a7bc7c987c | |
| parent | 399b956eb503c7b86409c470fda076415bd34f9f (diff) | |
wasp: apps: Remove __init__.py
wasp-os contains circular import dependancies (wasp includes apps which
include wasp) but this is normally harmless.
However using __init__.py exagerated to the problem and since the benefit
of the __init__ file is pretty anyway the let's just remove it.
| -rw-r--r-- | wasp/apps/__init__.py | 11 | ||||
| -rw-r--r-- | wasp/boards/pinetime/manifest.py | 1 | ||||
| -rw-r--r-- | wasp/wasp.py | 8 |
3 files changed, 7 insertions, 13 deletions
diff --git a/wasp/apps/__init__.py b/wasp/apps/__init__.py deleted file mode 100644 index a5ab777..0000000 --- a/wasp/apps/__init__.py +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: LGPL-3.0-or-later -# Copyright (C) 2020 Daniel Thompson -"""All the apps... in one place""" - -from apps.clock import ClockApp -from apps.flashlight import FlashlightApp -from apps.launcher import LauncherApp -from apps.pager import PagerApp, CrashApp -from apps.settings import SettingsApp -from apps.stopwatch import StopwatchApp -from apps.testapp import TestApp diff --git a/wasp/boards/pinetime/manifest.py b/wasp/boards/pinetime/manifest.py index 97641d6..d39ed05 100644 --- a/wasp/boards/pinetime/manifest.py +++ b/wasp/boards/pinetime/manifest.py @@ -4,7 +4,6 @@ freeze('.', 'watch.py', opt=3) freeze('../..', ( - 'apps/__init__.py', 'apps/clock.py', 'apps/flashlight.py', 'apps/launcher.py', diff --git a/wasp/wasp.py b/wasp/wasp.py index 3aba03e..a92ceed 100644 --- a/wasp/wasp.py +++ b/wasp/wasp.py @@ -13,7 +13,13 @@ import machine import watch import widgets -from apps import * +from apps.clock import ClockApp +from apps.flashlight import FlashlightApp +from apps.launcher import LauncherApp +from apps.pager import PagerApp, CrashApp +from apps.settings import SettingsApp +from apps.stopwatch import StopwatchApp +from apps.testapp import TestApp class EventType(): """Enumerated interface actions. |
