Python Glacier2/session typing fixes

Author: pepone

python/Glacier2/session/server/poke_session/manager.py

@@ -29,15 +29,15 @@ def __init__(self, adapter: Ice.ObjectAdapter):
 
     @override
     def create(
-        self, userId: str, sessionControl: Glacier2.SessionControlPrx | None, current: Ice.Current
+        self, userId: str, control: Glacier2.SessionControlPrx | None, current: Ice.Current
     ) -> Glacier2.SessionPrx:
-        # sessionControl is not None because we configured Glacier2.Server.Endpoints in the Glacier2 router
+        # control is not None because we configured Glacier2.Server.Endpoints in the Glacier2 router
         # configuration file.
-        assert sessionControl is not None
+        assert control is not None
 
         # Create a new session servant and add it to the adapter with a UUID identity. The name component of the
         # identity is the session token.
-        proxy = self._sessionAdapter.addWithUUID(DefaultPokeSession(self._sessionAdapter, sessionControl, self))
+        proxy = self._sessionAdapter.addWithUUID(DefaultPokeSession(self._sessionAdapter, control, self))
 
         sessionToken = proxy.ice_getIdentity().name
         self._tokenToUserId[sessionToken] = userId

python/Glacier2/session/server/poke_session/session.py

@@ -36,14 +36,14 @@ def __init__(
         self._userIdResolver = userIdResolver
 
     @override
-    def getPokeBox(self, current: Ice.Current) -> CatchThemAll.PokeBoxPrx | None:
+    def getPokeBox(self, current: Ice.Current) -> CatchThemAll.PokeBoxPrx:
         # The session token is the name component of the session identity; we use it for the identity of the PokeBox
         # object as well.
         proxy = self._adapter.createProxy(Ice.Identity(name=current.id.name, category="PokeBox"))
         return CatchThemAll.PokeBoxPrx.uncheckedCast(proxy)
 
     @override
-    async def destroy(self, current: Ice.Current) -> Awaitable[None]:
+    async def destroy(self, current: Ice.Current) -> None:
         print(f"Destroying session #{current.id.name}")
 
         # Remove the token from the user ID resolver, since the token is no longer valid.