From 13a504d476ce9b8a49bafb7b6adc2cba1cbb6551 Mon Sep 17 00:00:00 2001 From: Dan-in-CA Date: Sat, 30 Dec 2023 08:46:32 -0800 Subject: [PATCH] Fix plugin_manager and waveshare_relay bugs. --- plugin_manager/plugin_manager.py | 11 +---------- waveshare_relay_board/waveshare_relay_board.py | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) mode change 100644 => 100755 plugin_manager/plugin_manager.py diff --git a/plugin_manager/plugin_manager.py b/plugin_manager/plugin_manager.py old mode 100644 new mode 100755 index 3c1172c..0cf88f4 --- a/plugin_manager/plugin_manager.py +++ b/plugin_manager/plugin_manager.py @@ -1,23 +1,14 @@ # !/usr/bin/env python # -*- coding: utf-8 -*- -# Python 2/3 compatibility imports -from __future__ import print_function -from six.moves import zip -from six.moves import range -try: - from urllib.request import urlopen, Request -except ImportError: - from six.moves.urllib.request import urlopen, Request - # standard library imports import base64 import json -# import os import pathlib import re import subprocess import time +from urllib.request import urlopen # local module imports import gv # Get access to SIP's settings diff --git a/waveshare_relay_board/waveshare_relay_board.py b/waveshare_relay_board/waveshare_relay_board.py index 2e1fa0f..ee354b8 100644 --- a/waveshare_relay_board/waveshare_relay_board.py +++ b/waveshare_relay_board/waveshare_relay_board.py @@ -185,7 +185,7 @@ class settings(ProtectedPage): def GET(self): with open(u"./data/waveshare_relay_board.json", u"r") as f: # Read the settings from file params = json.load(f) - return template_render.relay_board(params) + return template_render.waveshare_relay_board(params) class settings_json(ProtectedPage):