From 99f757bf78ad176ed9c4cc621c10d15f3921e795 Mon Sep 17 00:00:00 2001 From: Enrico Faulhaber Date: Wed, 27 Mar 2019 15:28:14 +0100 Subject: [PATCH] fixup: rename *subtype* in client code as well Change-Id: I97cc836b2eaa508935113c225de593bbb9ad8821 Reviewed-on: https://forge.frm2.tum.de/review/20245 Tested-by: JenkinsCodeReview Reviewed-by: Enrico Faulhaber --- secop/client/baseclient.py | 2 +- secop/gui/nodectrl.py | 2 +- secop/gui/valuewidgets.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/secop/client/baseclient.py b/secop/client/baseclient.py index 9d6858e..f031b7a 100644 --- a/secop/client/baseclient.py +++ b/secop/client/baseclient.py @@ -382,7 +382,7 @@ class Client(object): if isinstance(datatype, EnumType): datatype._enum.name = aname if aname == 'status': - datatype.subtypes[0]._enum.name = 'Status' + datatype.members[0]._enum.name = 'Status' self.describing_data['modules'][module]['accessibles'] \ [aname]['datatype'] = datatype except Exception as _exc: diff --git a/secop/gui/nodectrl.py b/secop/gui/nodectrl.py index 0e8e6db..92c6095 100644 --- a/secop/gui/nodectrl.py +++ b/secop/gui/nodectrl.py @@ -248,7 +248,7 @@ class ReadableWidget(QWidget): # XXX: also connect update_status signal to LineEdit ?? def update_status(self, status, qualifiers=None): - display_string = self._status_type.subtypes[0]._enum[status[0]].name + display_string = self._status_type.members[0]._enum[status[0]].name if status[1]: display_string += ':' + status[1] self.statusLineEdit.setText(display_string) diff --git a/secop/gui/valuewidgets.py b/secop/gui/valuewidgets.py index 0145052..faefe2a 100644 --- a/secop/gui/valuewidgets.py +++ b/secop/gui/valuewidgets.py @@ -122,7 +122,7 @@ class TupleWidget(QFrame): def __init__(self, datatype, readonly=False, parent=None): super(TupleWidget, self).__init__(parent) - self.datatypes = datatype.subtypes + self.datatypes = datatype.members self.layout = QVBoxLayout() self.subwidgets = [] @@ -151,8 +151,8 @@ class StructWidget(QGroupBox): self.subwidgets = {} self.datatypes = [] self._labels = [] - for idx, name in enumerate(sorted(datatype.named_subtypes)): - dt = datatype.named_subtypes[name] + for idx, name in enumerate(sorted(datatype.members)): + dt = datatype.members[name] w = get_widget(dt, readonly=readonly, parent=self) l = QLabel(name) self.layout.addWidget(l, idx, 0)