diff --git a/rpipe/__init__.py b/rpipe/__init__.py index a538a3f..081fba2 100644 --- a/rpipe/__init__.py +++ b/rpipe/__init__.py @@ -1 +1 @@ -__version__: str = "9.5.3" # Must be "..", all numbers +__version__: str = "9.5.4" # Must be "..", all numbers diff --git a/rpipe/client/client/crypt.py b/rpipe/client/client/crypt.py index 292c7bc..7e5e32f 100644 --- a/rpipe/client/client/crypt.py +++ b/rpipe/client/client/crypt.py @@ -67,9 +67,9 @@ def decrypt(data: bytes, decompress: Callable[[bytes], bytes], password: str | N es = _EncryptedData.decode(data) sfx = "s" if len(es) != 1 else "" log.debug("Decrypting %d chunk%s", len(es), sfx) - r = tuple(_aes(e.salt, password, e.nonce).decrypt_and_verify(e.text, e.tag) for e in es) + r = [_aes(e.salt, password, e.nonce).decrypt_and_verify(e.text, e.tag) for e in es] log.debug("Decompressing %d chunk%s", len(es), sfx) - r = tuple(decompress(i) for i in r) + r = [decompress(i) for i in r] if len(es) > 1: log.debug("Merging chunks") return r[0] if len(r) == 1 else b"".join(r) diff --git a/rpipe/client/client/data.py b/rpipe/client/client/data.py index 3705cbf..6fb7f75 100644 --- a/rpipe/client/client/data.py +++ b/rpipe/client/client/data.py @@ -54,8 +54,8 @@ def channel_url(self) -> str: return f"{self.url}/c/{quote(self.channel)}" @classmethod - def keys(cls) -> tuple[str, ...]: - return tuple(i.name for i in fields(cls)) + def keys(cls) -> list[str]: + return [i.name for i in fields(cls)] @classmethod def load(cls, cli: dict[str, bool | str | Path | None], file: Path) -> Self: @@ -146,8 +146,8 @@ class Mode: checksum: bool @classmethod - def keys(cls) -> tuple[str, ...]: - return tuple(i.name for i in fields(cls)) + def keys(cls) -> list[str]: + return [i.name for i in fields(cls)] def priority(self) -> bool: c = (self.print_config, self.save_config, self.outdated, self.server_version, self.query).count(True) diff --git a/rpipe/server/channel/read.py b/rpipe/server/channel/read.py index 689fc4a..5c99f67 100644 --- a/rpipe/server/channel/read.py +++ b/rpipe/server/channel/read.py @@ -95,7 +95,7 @@ def read(state: State, channel: str) -> Response: if not args.delete: # Peek mode (could also be web version) log.debug("Reading channel %s in peek mode", channel) u.stats.peek(channel) - rdata: Sequence[bytes] = tuple(s.data) + rdata: Sequence[bytes] = s.data final = True elif args.version == WEB_VERSION: log.debug("Reading channel %s from WEB_VERSION", channel) diff --git a/rpipe/server/server/state.py b/rpipe/server/server/state.py index 2c8c424..536a3ed 100644 --- a/rpipe/server/server/state.py +++ b/rpipe/server/server/state.py @@ -69,7 +69,7 @@ def load(self, file: Path) -> None: return self._log.debug("Creating server Stats") self.stats = Stats() - _ = tuple(self.stats.channels[i] for i in self.streams) + _ = [self.stats.channels[i] for i in self.streams] self._log.info("State loaded successfully") def save(self, file: Path) -> None: