From e32fd688e4548133d7455b45b0e5f4823f84922a Mon Sep 17 00:00:00 2001
From: Eric Callahan <arksine.code@gmail.com>
Date: Tue, 21 Feb 2023 20:21:01 -0500
Subject: [PATCH] moonraker: correct stale annotations
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
---
moonraker/components/paneldue.py | 3 ++-
moonraker/components/update_manager/update_manager.py | 2 +-
moonraker/confighelper.py | 6 +++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/moonraker/components/paneldue.py b/moonraker/components/paneldue.py
index eedd96e..9443d32 100644
--- a/moonraker/components/paneldue.py
+++ b/moonraker/components/paneldue.py
@@ -268,7 +268,8 @@ class PanelDue:
async def _process_klippy_ready(self) -> None:
# Request "info" and "configfile" status
retries = 10
- printer_info = cfg_status = {}
+ printer_info: Dict[str, Any] = {}
+ cfg_status: Dict[str, Any] = {}
while retries:
try:
printer_info = await self.klippy_apis.get_klippy_info()
diff --git a/moonraker/components/update_manager/update_manager.py b/moonraker/components/update_manager/update_manager.py
index 84cc1bc..2725b85 100644
--- a/moonraker/components/update_manager/update_manager.py
+++ b/moonraker/components/update_manager/update_manager.py
@@ -708,7 +708,7 @@ class PackageDeploy(BaseDeploy):
except shell_cmd.error:
return None
# APT Command found should be available
- logging.debug(f"APT package manager detected: {ret.encode()}")
+ logging.debug(f"APT package manager detected: {ret}")
provider = AptCliProvider(self.cmd_helper)
try:
await provider.initialize()
diff --git a/moonraker/confighelper.py b/moonraker/confighelper.py
index 012dd4f..c83d274 100644
--- a/moonraker/confighelper.py
+++ b/moonraker/confighelper.py
@@ -32,12 +32,12 @@ from typing import (
Dict,
List,
Type,
+ TextIO
)
if TYPE_CHECKING:
from .server import Server
from .components.gpio import GpioFactory, GpioOutputPin
from .components.template import TemplateFactory
- from io import TextIOWrapper
_T = TypeVar("_T")
ConfigVal = Union[None, int, float, bool, str, dict, list]
@@ -468,11 +468,11 @@ class ConfigHelper:
"failed to load. In the future this will result "
"in a startup error.")
- def create_backup(self):
+ def create_backup(self) -> None:
cfg_path = self.server.get_app_args()["config_file"]
cfg = pathlib.Path(cfg_path).expanduser().resolve()
backup = cfg.parent.joinpath(f".{cfg.name}.bkp")
- backup_fp: Optional[TextIOWrapper] = None
+ backup_fp: Optional[TextIO] = None
try:
if backup.exists():
cfg_mtime: int = 0