From 0ada0b07b895c9842df7a04b35c47199e9345fe2 Mon Sep 17 00:00:00 2001 From: monsieur_h Date: Tue, 26 Dec 2017 15:17:14 +0100 Subject: [PATCH 1/2] fixes import error --- output/drivers/pygame_emulator_factory.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/output/drivers/pygame_emulator_factory.py b/output/drivers/pygame_emulator_factory.py index 79da99da..94ce0912 100644 --- a/output/drivers/pygame_emulator_factory.py +++ b/output/drivers/pygame_emulator_factory.py @@ -6,12 +6,11 @@ """ import luma.emulator.device + from helpers import setup_logger # ignore PIL debug messages -logging.getLogger("PIL").setLevel(logging.ERROR) - logger = setup_logger(__name__) def get_pygame_emulator_device(width=128, height=64): From a9406faa73397f235c3a4483fa45c89c15911e3e Mon Sep 17 00:00:00 2001 From: monsieur_h Date: Tue, 26 Dec 2017 12:52:13 +0100 Subject: [PATCH 2/2] fixes a bug where importing ZeroApp could lead to considering the abstract class ZeroApp as the main class for the current module --- apps/app_manager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/app_manager.py b/apps/app_manager.py index 66eb5573..baeff2ff 100755 --- a/apps/app_manager.py +++ b/apps/app_manager.py @@ -3,9 +3,9 @@ import traceback from apps import zero_app +from helpers import setup_logger from ui import Printer, Menu -from helpers import setup_logger logger = setup_logger(__name__, "info") @@ -200,10 +200,10 @@ def get_zeroapp_class_in_module(module_): for item in module_content: class_ = getattr(module_, item) try: - if issubclass(class_, zero_app.ZeroApp): + if issubclass(class_, zero_app.ZeroApp) and item != 'ZeroApp': return class_ except Exception as e: - pass # todo : check why isinstance(class_, ClassType)==False in python2 + pass # not a class : ignore return None