diff --git a/yamcs-client/src/yamcs/mdb/model.py b/yamcs-client/src/yamcs/mdb/model.py index 6d67722..ad7083d 100644 --- a/yamcs-client/src/yamcs/mdb/model.py +++ b/yamcs-client/src/yamcs/mdb/model.py @@ -31,32 +31,19 @@ def qualified_name(self) -> str: return self._proto.qualifiedName @property - def aliases(self) -> List[Tuple[str, str]]: - """ - List of (namespace, name) pairs, as 2-tuples - - .. deprecated:: 1.9.2 - Use :attr:`aliases_dict` instead, which returns a dictionary instead of - a list of 2-tuples. - - In a future release, the ``aliases`` property will be changed to match the - return type of :attr:`aliases_dict`. - """ - warnings.warn( - "Use 'aliases_dict' instead of 'aliases'. This returns " - "a dictionary instead of a list of 2-tuples. In a future release, " - "the 'aliases' property will be changed to match the return type " - "of 'aliases_dict'.", - category=FutureWarning, - ) - return list( - {alias.namespace: alias.name for alias in self._proto.alias}.items() - ) + def aliases(self) -> Dict[str, str]: + """Aliases, keyed by namespace""" + return {alias.namespace: alias.name for alias in self._proto.alias} @property def aliases_dict(self) -> Dict[str, str]: - """Aliases, keyed by namespace""" - return {alias.namespace: alias.name for alias in self._proto.alias} + """ + Aliases, keyed by namespace + + This method shall be deprecated in a future release. Use + :attr:`aliases` instead. + """ + return self.aliases @property def description(self) -> Optional[str]: diff --git a/yamcs-client/src/yamcs/model.py b/yamcs-client/src/yamcs/model.py index bdee1cc..4edace2 100644 --- a/yamcs-client/src/yamcs/model.py +++ b/yamcs-client/src/yamcs/model.py @@ -4,7 +4,6 @@ from yamcs.core.helpers import parse_server_time from yamcs.protobuf.events import events_pb2 from yamcs.protobuf.instances import instances_pb2 -from yamcs.protobuf.links import links_pb2 from yamcs.protobuf.services import services_pb2 diff --git a/yamcs-client/src/yamcs/storage/client.py b/yamcs-client/src/yamcs/storage/client.py index 93b9b96..1c8a748 100644 --- a/yamcs-client/src/yamcs/storage/client.py +++ b/yamcs-client/src/yamcs/storage/client.py @@ -92,7 +92,7 @@ def create_bucket(self, bucket_name: str): """ req = buckets_pb2.CreateBucketRequest() req.name = bucket_name - url = f"/storage/buckets" + url = "/storage/buckets" self.ctx.post_proto(url, data=req.SerializeToString()) def remove_bucket(self, bucket_name: str):