File kvmd-python37-no-assignment-exprs.patch of Package kvmd

Overview Repositories Revisions Requests Users Attributes Meta

File kvmd-python37-no-assignment-exprs.patch of Package kvmd (Revision d114fef1b9386dd8e2eed50a9e35d379)

Currently displaying revision d114fef1b9386dd8e2eed50a9e35d379 , Show latest

From 1b4b6d248c165cb0703f6d27a23ae683ccd0a41f Mon Sep 17 00:00:00 2001
From: Oleg Girko <ol@infoserver.lv>
Date: Tue, 18 Aug 2020 03:44:06 +0300
Subject: [PATCH] Remove all uses of assignment expressions.

This is needed to port to Python 3.7 because
Raspbian 10 doesn't have Python 3.8.

diff --git a/kvmd/aiotools.py b/kvmd/aiotools.py
index d790158..831fe18 100644
--- a/kvmd/aiotools.py
+++ b/kvmd/aiotools.py
@@ -177,5 +177,6 @@ async def run_region_task(
 
     if entered.done():
         return
-    if (exc := task.exception()) is not None:
+    exc = task.exception()
+    if exc is not None:
         raise exc
diff --git a/kvmd/apps/kvmd/api/streamer.py b/kvmd/apps/kvmd/api/streamer.py
index 995ed83..cd5f045 100644
--- a/kvmd/apps/kvmd/api/streamer.py
+++ b/kvmd/apps/kvmd/api/streamer.py
@@ -56,11 +56,12 @@ class StreamerApi:
 
     @exposed_http("GET", "/streamer/snapshot")
     async def __take_snapshot_handler(self, request: Request) -> Response:
-        if (snapshot := await self.__streamer.take_snapshot(
+        snapshot = await self.__streamer.take_snapshot(
             save=valid_bool(request.query.get("save", "false")),
             load=valid_bool(request.query.get("load", "false")),
             allow_offline=valid_bool(request.query.get("allow_offline", "false")),
-        )):
+        )
+        if snapshot:
             if valid_bool(request.query.get("preview", "false")):
                 data = await self.__make_preview(
                     snapshot=snapshot,
diff --git a/kvmd/apps/kvmd/http.py b/kvmd/apps/kvmd/http.py
index 729c849..af9f961 100644
--- a/kvmd/apps/kvmd/http.py
+++ b/kvmd/apps/kvmd/http.py
@@ -78,7 +78,7 @@ def get_exposed_http(obj: object) -> List[HttpExposed]:
             handler=handler,
         )
         for name in dir(obj)
-        if inspect.ismethod(handler := getattr(obj, name)) and getattr(handler, _HTTP_EXPOSED, False)
+        if inspect.ismethod(getattr(obj, name)) and getattr(getattr(obj, name), _HTTP_EXPOSED, False)
     ]
 
 
@@ -108,7 +108,7 @@ def get_exposed_ws(obj: object) -> List[WsExposed]:
             handler=handler,
         )
         for name in dir(obj)
-        if inspect.ismethod(handler := getattr(obj, name)) and getattr(handler, _WS_EXPOSED, False)
+        if inspect.ismethod(getattr(obj, name)) and getattr(getattr(obj, name), _WS_EXPOSED, False)
     ]
 
 
diff --git a/kvmd/apps/kvmd/info/hw.py b/kvmd/apps/kvmd/info/hw.py
index b9b7c94..8df8aee 100644
--- a/kvmd/apps/kvmd/info/hw.py
+++ b/kvmd/apps/kvmd/info/hw.py
@@ -109,10 +109,11 @@ class HwInfoSubmanager(BaseInfoSubmanager):
 
     async def __get_throttling(self) -> Optional[Dict]:
         # https://www.raspberrypi.org/forums/viewtopic.php?f=63&t=147781&start=50#p972790
-        if (flags := await self.__parse_vcgencmd(
+        flags = await self.__parse_vcgencmd(
             arg="get_throttled",
             parser=(lambda text: int(text.split("=")[-1].strip(), 16)),
-        )) is not None:
+        )
+        if flags is not None:
             return {
                 "raw_flags": flags,
                 "parsed_flags": {
diff --git a/kvmd/apps/kvmd/server.py b/kvmd/apps/kvmd/server.py
index 14c975f..cf83333 100644
--- a/kvmd/apps/kvmd/server.py
+++ b/kvmd/apps/kvmd/server.py
@@ -207,7 +207,8 @@ class KvmdServer(HttpServer):  # pylint: disable=too-many-arguments,too-many-ins
             ("desired_fps", valid_stream_fps, None),
             ("resolution", valid_stream_resolution, StreamerResolutionNotSupported),
         ]:
-            if (value := request.query.get(name)):
+            value = request.query.get(name)
+            if (value):
                 if name not in current_params:
                     assert exc_cls is not None, name
                     raise exc_cls()
diff --git a/kvmd/apps/vnc/rfb/__init__.py b/kvmd/apps/vnc/rfb/__init__.py
index f10d7da..765d157 100644
--- a/kvmd/apps/vnc/rfb/__init__.py
+++ b/kvmd/apps/vnc/rfb/__init__.py
@@ -363,7 +363,8 @@ class RfbClient(RfbClientStream):  # pylint: disable=too-many-instance-attribute
         }
         while True:
             msg_type = await self._read_number("B")
-            if (handler := handlers.get(msg_type)) is not None:
+            handler = handlers.get(msg_type)
+            if handler is not None:
                 await handler()  # type: ignore  # mypy bug
             else:
                 raise RfbError(f"Unknown message type: {msg_type}")
diff --git a/kvmd/apps/vnc/server.py b/kvmd/apps/vnc/server.py
index 2ab03f3..61be517 100644
--- a/kvmd/apps/vnc/server.py
+++ b/kvmd/apps/vnc/server.py
@@ -239,7 +239,8 @@ class _Client(RfbClient):  # pylint: disable=too-many-instance-attributes
 
     async def _on_key_event(self, code: int, state: bool) -> None:
         if self.__kvmd_ws:
-            if (web_key := self.__symmap.get(code)) is not None:
+            web_key = self.__symmap.get(code)
+            if web_key is not None:
                 await self.__kvmd_ws.send_key_event(web_key.name, state)
 
     async def _on_pointer_event(self, buttons: Dict[str, bool], wheel: Dict[str, int], move: Dict[str, int]) -> None:
diff --git a/kvmd/keyboard/keysym.py b/kvmd/keyboard/keysym.py
index aa4a867..2f2bc7a 100644
--- a/kvmd/keyboard/keysym.py
+++ b/kvmd/keyboard/keysym.py
@@ -54,7 +54,8 @@ def build_symmap(path: str) -> Dict[int, SymmapWebKey]:
         (path, list(_read_keyboard_layout(path).items())),
     ]:
         for (code, key) in items:
-            if (web_name := AT1_TO_WEB.get(key.code)) is not None:
+            web_name = AT1_TO_WEB.get(key.code)
+            if web_name is not None:
                 if (
                     (web_name in ["ShiftLeft", "ShiftRight"] and key.shift)  # pylint: disable=too-many-boolean-expressions
                     or (web_name in ["AltLeft", "AltRight"] and key.altgr)
@@ -113,7 +114,8 @@ def _read_keyboard_layout(path: str) -> Dict[int, At1Key]:  # Keysym to evdev (a
 
         parts = line.split()
         if len(parts) >= 2:
-            if (x11_code := _resolve_keysym(parts[0])) != 0:
+            x11_code = _resolve_keysym(parts[0])
+            if x11_code != 0:
                 try:
                     at1_code = int(parts[1], 16)
                 except ValueError as err:
@@ -128,7 +130,8 @@ def _read_keyboard_layout(path: str) -> Dict[int, At1Key]:  # Keysym to evdev (a
                     ctrl=("ctrl" in rest),
                 )
 
-                if "addupper" in rest and (x11_code := _resolve_keysym(parts[0].upper())) != 0:
+                x11_code = _resolve_keysym(parts[0].upper())
+                if "addupper" in rest and x11_code != 0:
                     layout[x11_code] = At1Key(
                         code=at1_code,
                         shift=True,
-- 
2.26.2

Places

File kvmd-python37-no-assignment-exprs.patch of Package kvmd (Revision d114fef1b9386dd8e2eed50a9e35d379)

Places