use 'Final' type hint for constants

xpra/net/file_transfer.py

@@ -10,7 +10,7 @@
 import subprocess
 import hashlib
 import uuid
-from typing import Any
+from typing import Any, Final
 from time import monotonic
 from dataclasses import dataclass
 from collections.abc import Callable
@@ -40,15 +40,15 @@
 SEND_REQUEST_TIMEOUT = max(300, envint("XPRA_SEND_REQUEST_TIMEOUT", 3600))
 CHUNK_TIMEOUT = 10 * 1000
 
-MIMETYPE_EXTS = {
+MIMETYPE_EXTS: dict[str, str] = {
     "application/postscript": "ps",
     "application/pdf": "pdf",
     "raw": "raw",
 }
 
-DENY = 0
-ACCEPT = 1  # the file / URL will be sent
-OPEN = 2  # don't send, open on sender
+DENY: Final[int] = 0
+ACCEPT: Final[int] = 1  # the file / URL will be sent
+OPEN: Final[int] = 2  # don't send, open on sender
 
 
 def osclose(fd: int) -> None:
@@ -399,7 +399,7 @@ def _process_send_file_chunk(self, packet: PacketType) -> None:
             filelog("got chunk for a cancelled file transfer, ignoring it")
             return
 
-        def progress(position, error=None):
+        def progress(position: int, error="") -> None:
             s_elapsed = monotonic() - chunk_state.start
             self.transfer_progress_update(False, chunk_state.send_id, s_elapsed, position, chunk_state.filesize, error)
 
@@ -603,7 +603,7 @@ def process_downloaded_file(self, filename: str, mimetype: str,
             filelog("started process-download thread: %s", t)
 
     def do_process_downloaded_file(self, filename: str, mimetype: str, printit: bool, openit: bool, filesize: int,
-                                   options: typedict):
+                                   options: typedict) -> None:
         filelog("do_process_downloaded_file%s", (filename, mimetype, printit, openit, filesize, options))
         if printit:
             self._print_file(filename, mimetype, options)
@@ -740,7 +740,7 @@ def send_request_file(self, filename: str, openit: bool = True):
         self.send("request-file", filename, openit)
         self.files_requested[filename] = openit
 
-    def _process_open_url(self, packet: PacketType):
+    def _process_open_url(self, packet: PacketType) -> None:
         send_id = str(packet[2])
         url = str(packet[1])
         if not self.open_url:
@@ -764,11 +764,11 @@ def send_open_url(self, url: str) -> bool:
         self.do_send_open_url(url)
         return True
 
-    def do_send_open_url(self, url: str, send_id: str = ""):
+    def do_send_open_url(self, url: str, send_id: str = "") -> None:
         self.send("open-url", url, send_id)
 
     def send_file(self, filename: str, mimetype: str, data: SizedBuffer, filesize=0,
-                  printit=False, openit=False, options=None):
+                  printit=False, openit=False, options=None) -> bool:
         if printit:
             if not self.printing:
                 printlog.warn("Warning: printing is not enabled for %s", self)
@@ -838,7 +838,7 @@ def do_process_send_data_request(self, dtype: str, send_id: str, url: str, _, fi
                                      printit: bool, openit: bool, options: typedict) -> None:
         filelog(f"do_process_send_data_request: {send_id=}, {url=}, {printit=}, {openit=}, {options=}")
 
-        def cb_answer(accept: bool):
+        def cb_answer(accept: bool) -> bool:
             filelog("accept%s=%s", (url, printit, openit), accept)
             self.send("send-data-response", send_id, accept)
 

xpra/net/protocol/constants.py

@@ -4,6 +4,8 @@
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
-CONNECTION_LOST = "connection-lost"
-GIBBERISH = "gibberish"
-INVALID = "invalid"
+from typing import Final
+
+CONNECTION_LOST: Final[str] = "connection-lost"
+GIBBERISH: Final[str] = "gibberish"
+INVALID: Final[str] = "invalid"

xpra/server/dbus/server_base.py

@@ -4,6 +4,8 @@
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
+from typing import Final
+
 import dbus.service  # @UnresolvedImport
 from dbus import PROPERTIES_IFACE  # @UnresolvedImport
 from dbus.exceptions import DBusException  # @UnresolvedImport
@@ -13,9 +15,9 @@
 
 log = Logger("dbus", "server")
 
-BUS_NAME = "org.xpra.Server"
-INTERFACE = "org.xpra.Server"
-PATH = "/org/xpra/Server"
+BUS_NAME: Final[str] = "org.xpra.Server"
+INTERFACE: Final[str] = "org.xpra.Server"
+PATH: Final[str] = "/org/xpra/Server"
 
 
 class DBUS_Server_Base(dbus.service.Object):

xpra/server/dbus/source.py

@@ -4,6 +4,8 @@
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
+from typing import Final
+
 import dbus.service  # @UnresolvedImport
 from dbus import PROPERTIES_IFACE  # @UnresolvedImport
 from dbus.exceptions import DBusException  # @UnresolvedImport
@@ -16,9 +18,9 @@
 
 log = Logger("dbus", "server")
 
-BUS_NAME = "org.xpra.Server"
-INTERFACE = "org.xpra.Client"
-PATH = "/org/xpra/Client"
+BUS_NAME: Final[str] = "org.xpra.Server"
+INTERFACE: Final[str] = "org.xpra.Client"
+PATH: Final[str] = "/org/xpra/Client"
 
 
 def n(*args):

xpra/x11/bindings/send_wm.py

@@ -4,16 +4,18 @@
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
+from typing import Final
+
 from xpra.x11.bindings.window import constants, X11WindowBindings
 from xpra.log import Logger
 
 log = Logger("x11", "focus")
 
 X11Window = X11WindowBindings()
 
-CurrentTime = constants["CurrentTime"]
-SubstructureNotifyMask = constants["SubstructureNotifyMask"]
-SubstructureRedirectMask = constants["SubstructureRedirectMask"]
+CurrentTime: Final[int] = constants["CurrentTime"]
+SubstructureNotifyMask: Final[int] = constants["SubstructureNotifyMask"]
+SubstructureRedirectMask: Final[int] = constants["SubstructureRedirectMask"]
 
 
 def send_wm_take_focus(xid: int, timestamp: int = CurrentTime) -> None:

xpra/x11/gtk/clipboard.py

@@ -5,7 +5,7 @@
 
 import os
 import struct
-from typing import Any
+from typing import Any, Final
 from collections.abc import Iterable, Callable, Sequence
 
 from xpra.os_util import gi_import
@@ -39,8 +39,8 @@
 
 log = Logger("x11", "clipboard")
 
-CurrentTime: int = constants["CurrentTime"]
-StructureNotifyMask: int = constants["StructureNotifyMask"]
+CurrentTime: Final[int] = constants["CurrentTime"]
+StructureNotifyMask: Final[int] = constants["StructureNotifyMask"]
 
 sizeof_long = struct.calcsize(b'@L')
 

xpra/x11/gtk/composite.py

@@ -4,6 +4,8 @@
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
+from typing import Final
+
 from xpra.os_util import gi_import
 from xpra.gtk.gobject import one_arg_signal
 from xpra.gtk.error import xlog
@@ -23,7 +25,7 @@
 X11Window = X11WindowBindings()
 X11Window.ensure_XComposite_support()
 
-StructureNotifyMask = constants["StructureNotifyMask"]
+StructureNotifyMask: Final[int] = constants["StructureNotifyMask"]
 
 
 class CompositeHelper(WindowDamageHandler, GObject.GObject):

xpra/x11/gtk/damage.py

@@ -4,6 +4,7 @@
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
+from typing import Final
 
 from xpra.util.env import envbool
 from xpra.gtk.gobject import one_arg_signal
@@ -21,7 +22,7 @@
 X11Window = X11WindowBindings()
 X11Window.ensure_XDamage_support()
 
-StructureNotifyMask = constants["StructureNotifyMask"]
+StructureNotifyMask: Final[int] = constants["StructureNotifyMask"]
 USE_XSHM = envbool("XPRA_XSHM", True)
 
 

xpra/x11/gtk/selection.py

@@ -10,6 +10,7 @@
 # else steals it, then we should exit.
 
 import sys
+from typing import Final
 from struct import unpack, calcsize
 
 from xpra.gtk.gobject import no_arg_signal, one_arg_signal
@@ -29,8 +30,8 @@
 
 SELECTION_EXIT_TIMEOUT = envint("XPRA_SELECTION_EXIT_TIMEOUT", 20)
 
-StructureNotifyMask = constants["StructureNotifyMask"]
-XNone = constants["XNone"]
+StructureNotifyMask: Final[int] = constants["StructureNotifyMask"]
+XNone: Final[int] = constants["XNone"]
 
 
 class AlreadyOwned(Exception):

xpra/x11/gtk/tray.py

@@ -4,6 +4,7 @@
 # later version. See the file COPYING for details.
 
 import struct
+from typing import Final
 from enum import IntEnum
 
 from xpra.util.env import envint
@@ -25,8 +26,8 @@
 
 log = Logger("x11", "tray")
 
-XNone = constants["XNone"]
-StructureNotifyMask = constants["StructureNotifyMask"]
+XNone: Final[int] = constants["XNone"]
+StructureNotifyMask: Final[int] = constants["StructureNotifyMask"]
 
 XEMBED_VERSION = 0
 
@@ -59,9 +60,9 @@ class XEMBED_FOCUS(IntEnum):
     LAST = 2
 
 
-SELECTION = "_NET_SYSTEM_TRAY_S0"
-SYSTRAY_VISUAL = "_NET_SYSTEM_TRAY_VISUAL"
-SYSTRAY_ORIENTATION = "_NET_SYSTEM_TRAY_ORIENTATION"
+SELECTION: Final[str] = "_NET_SYSTEM_TRAY_S0"
+SYSTRAY_VISUAL: Final[str] = "_NET_SYSTEM_TRAY_VISUAL"
+SYSTRAY_ORIENTATION: Final[str] = "_NET_SYSTEM_TRAY_ORIENTATION"
 
 
 class TRAY_ORIENTATION(IntEnum):

xpra/x11/gtk/wm.py

@@ -5,7 +5,7 @@
 # later version. See the file COPYING for details.
 
 import os
-from typing import Any
+from typing import Any, Final
 
 from xpra.util.env import envbool
 from xpra.os_util import gi_import
@@ -37,13 +37,13 @@
 screenlog = Logger("x11", "window", "screen")
 framelog = Logger("x11", "window", "frame")
 
-CWX = constants["CWX"]
-CWY = constants["CWY"]
-CWWidth = constants["CWWidth"]
-CWHeight = constants["CWHeight"]
+CWX: Final[int] = constants["CWX"]
+CWY: Final[int] = constants["CWY"]
+CWWidth: Final[int] = constants["CWWidth"]
+CWHeight: Final[int] = constants["CWHeight"]
 
-NotifyPointerRoot = constants["NotifyPointerRoot"]
-NotifyDetailNone = constants["NotifyDetailNone"]
+NotifyPointerRoot: Final[int] = constants["NotifyPointerRoot"]
+NotifyDetailNone: Final[int] = constants["NotifyDetailNone"]
 
 LOG_MANAGE_FAILURES = envbool("XPRA_LOG_MANAGE_FAILURES", False)
 

xpra/x11/gtk/world_window.py

@@ -4,6 +4,8 @@
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
+from typing import Final
+
 from xpra.os_util import gi_import
 from xpra.gtk.error import xlog
 from xpra.util.env import IgnoreWarningsContext, ignorewarnings
@@ -19,8 +21,8 @@
 log = Logger("x11", "window")
 focuslog = Logger("x11", "window", "focus")
 
-XNone = constants["XNone"]
-CurrentTime = constants["CurrentTime"]
+XNone: Final[int] = constants["XNone"]
+CurrentTime: Final[int] = constants["CurrentTime"]
 
 
 # This file defines Xpra's top-level widget.  It is a magic window that

xpra/x11/models/base.py

@@ -4,6 +4,7 @@
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
+from typing import Final
 from collections.abc import Callable, Sequence
 
 from xpra.os_util import gi_import
@@ -37,9 +38,9 @@
     _NET_WM_STATE_ADD: "ADD",
     _NET_WM_STATE_TOGGLE: "TOGGLE",
 }
-WithdrawnState: int = constants["WithdrawnState"]
-IconicState: int = constants["IconicState"]
-NormalState: int = constants["NormalState"]
+WithdrawnState: Final[int] = constants["WithdrawnState"]
+IconicState: Final[int] = constants["IconicState"]
+NormalState: Final[int] = constants["NormalState"]
 WM_STATE_NAME: dict[int, str] = {
     IconicState: "Iconic",
     NormalState: "Normal",

xpra/x11/models/core.py

@@ -7,7 +7,7 @@
 import os
 import signal
 from socket import gethostname
-from typing import Any
+from typing import Any, Final
 from collections.abc import Callable, Sequence
 
 from xpra.os_util import gi_import
@@ -55,7 +55,7 @@
 DELETE_KILL_PID = envbool("XPRA_DELETE_KILL_PID", True)
 DELETE_XKILL = envbool("XPRA_DELETE_XKILL", True)
 
-CurrentTime = constants["CurrentTime"]
+CurrentTime: Final[int] = constants["CurrentTime"]
 
 # Re-stacking:
 Above = 0
@@ -72,11 +72,11 @@
 }
 
 # grab stuff:
-NotifyNormal = constants["NotifyNormal"]
-NotifyGrab = constants["NotifyGrab"]
-NotifyUngrab = constants["NotifyUngrab"]
-NotifyWhileGrabbed = constants["NotifyWhileGrabbed"]
-NotifyNonlinearVirtual = constants["NotifyNonlinearVirtual"]
+NotifyNormal: Final[int] = constants["NotifyNormal"]
+NotifyGrab: Final[int] = constants["NotifyGrab"]
+NotifyUngrab: Final[int] = constants["NotifyUngrab"]
+NotifyWhileGrabbed: Final[int] = constants["NotifyWhileGrabbed"]
+NotifyNonlinearVirtual: Final[int] = constants["NotifyNonlinearVirtual"]
 GRAB_CONSTANTS: dict[int, str] = {
     NotifyNormal: "NotifyNormal",
     NotifyGrab: "NotifyGrab",

xpra/x11/models/window.py

@@ -4,6 +4,7 @@
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
+from typing import Final
 from math import ceil, floor
 
 from xpra.os_util import gi_import
@@ -37,14 +38,14 @@
 
 X11Window = X11WindowBindings()
 
-CWX: int = constants["CWX"]
-CWY: int = constants["CWY"]
-CWWidth: int = constants["CWWidth"]
-CWHeight: int = constants["CWHeight"]
-CWBorderWidth: int = constants["CWBorderWidth"]
-CWSibling: int = constants["CWSibling"]
-CWStackMode: int = constants["CWStackMode"]
-CONFIGURE_GEOMETRY_MASK: int = CWX | CWY | CWWidth | CWHeight
+CWX: Final[int] = constants["CWX"]
+CWY: Final[int] = constants["CWY"]
+CWWidth: Final[int] = constants["CWWidth"]
+CWHeight: Final[int] = constants["CWHeight"]
+CWBorderWidth: Final[int] = constants["CWBorderWidth"]
+CWSibling: Final[int] = constants["CWSibling"]
+CWStackMode: Final[int] = constants["CWStackMode"]
+CONFIGURE_GEOMETRY_MASK: Final[int] = CWX | CWY | CWWidth | CWHeight
 CW_MASK_TO_NAME: dict[int, str] = {
     CWX: "X",
     CWY: "Y",