#3978 must use the correct type hints for cythonization

xpra/client/auth/env.py

@@ -18,5 +18,5 @@ def __repr__(self):
     def get_digest(self) -> str:
         return ""
 
-    def handle(self, challenge: str, digest: str, prompt: str) -> str:  # pylint: disable=unused-argument
+    def handle(self, challenge: bytes, digest: str, prompt: str) -> str:  # pylint: disable=unused-argument
         return os.environ.get(self.var_name, "")

xpra/client/auth/file.py

@@ -26,7 +26,7 @@ def __repr__(self):
     def get_digest(self) -> str:
         return ""
 
-    def handle(self, challenge: str, digest: str, prompt: str) -> bytes:  # pylint: disable=unused-argument
+    def handle(self, challenge: bytes, digest: str, prompt: str) -> bytes:  # pylint: disable=unused-argument
         log("handle(..) password_file=%s", self.password_file)
         if not self.password_file:
             return b""

xpra/client/auth/gss.py

@@ -25,7 +25,7 @@ def __repr__(self):
     def get_digest() -> str:
         return "gss"
 
-    def handle(self, challenge: str, digest, prompt: str):  # pylint: disable=unused-argument
+    def handle(self, challenge: bytes, digest: str, prompt: str):  # pylint: disable=unused-argument
         if not digest.startswith("gss:"):
             # not a gss challenge
             log("%s is not a gss challenge", digest)

xpra/client/auth/kerberos.py

@@ -39,7 +39,7 @@ def __repr__(self):
     def get_digest(self) -> str:
         return "kerberos"
 
-    def handle(self, challenge: str, digest: str, prompt: str):  # pylint: disable=unused-argument
+    def handle(self, challenge: bytes, digest: str, prompt: str):  # pylint: disable=unused-argument
         if not digest.startswith("kerberos:"):
             log("%s is not a kerberos challenge", digest)
             # not a kerberos challenge

xpra/client/auth/prompt.py

@@ -15,7 +15,7 @@ def __repr__(self):
     def get_digest(self) -> str:
         return ""
 
-    def handle(self, challenge: str, digest: str, prompt: str = "password"):  # pylint: disable=unused-argument
+    def handle(self, challenge: bytes, digest: str, prompt: str = "password"):  # pylint: disable=unused-argument
         digest_type = digest.split(":", 1)[0]
         if not prompt and digest_type in ("gss", "kerberos"):
             prompt = f"{digest_type} token"

xpra/client/auth/u2f.py

@@ -28,7 +28,7 @@ def __repr__(self):
     def get_digest() -> str:
         return "u2f"
 
-    def handle(self, challenge: str, digest: str, prompt: str) -> (
+    def handle(self, challenge: bytes, digest: str, prompt: str) -> (
             tuple[bytes, bytes] | None):  # pylint: disable=unused-argument
         if not digest.startswith("u2f:"):
             log("%s is not a u2f challenge", digest)

xpra/client/auth/uri.py

@@ -16,5 +16,5 @@ def __repr__(self):
     def get_digest() -> str:
         return ""
 
-    def handle(self, challenge: str, digest: str, prompt: str) -> str:  # pylint: disable=unused-argument
+    def handle(self, challenge: bytes, digest: str, prompt: str) -> str:  # pylint: disable=unused-argument
         return self.client.password

xpra/client/base/client.py

@@ -832,7 +832,7 @@ def do_process_challenge(self, packet: PacketType) -> None:
         while self.challenge_handlers:
             handler = self.pop_challenge_handler(digest)
             try:
-                challenge = packet[1]
+                challenge = strtobytes(packet[1])
                 prompt = "password"
                 if len(packet) >= 6:
                     prompt = std(str(packet[5]), extras="-,./: '")