From 182f1e2380870d8facbef72b811411bb7258f6ae Mon Sep 17 00:00:00 2001 From: Alex Forencich Date: Thu, 22 Oct 2020 23:27:58 -0700 Subject: [PATCH] Correctly handle None --- cocotbext/axi/stream.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cocotbext/axi/stream.py b/cocotbext/axi/stream.py index e960920..e8e17a5 100644 --- a/cocotbext/axi/stream.py +++ b/cocotbext/axi/stream.py @@ -64,10 +64,10 @@ class StreamSource(object): self.ready = None self.valid = None - if hasattr(self.bus, self._ready_signal): + if self._ready_signal is not None and hasattr(self.bus, self._ready_signal): self.ready = getattr(self.bus, self._ready_signal) - if hasattr(self.bus, self._valid_signal): + if self._valid_signal is not None and hasattr(self.bus, self._valid_signal): self.valid = getattr(self.bus, self._valid_signal) self.valid.setimmediatevalue(0) @@ -177,11 +177,11 @@ class StreamSink(object): super().__init__(*args, **kwargs) - if hasattr(self.bus, self._ready_signal): + if self._ready_signal is not None and hasattr(self.bus, self._ready_signal): self.ready = getattr(self.bus, self._ready_signal) self.ready.setimmediatevalue(0) - if hasattr(self.bus, self._valid_signal): + if self._valid_signal is not None and hasattr(self.bus, self._valid_signal): self.valid = getattr(self.bus, self._valid_signal) for sig in self._signals+self._optional_signals: @@ -269,10 +269,10 @@ class StreamMonitor(object): super().__init__(*args, **kwargs) - if hasattr(self.bus, self._ready_signal): + if self._ready_signal is not None and hasattr(self.bus, self._ready_signal): self.ready = getattr(self.bus, self._ready_signal) - if hasattr(self.bus, self._valid_signal): + if self._valid_signal is not None and hasattr(self.bus, self._valid_signal): self.valid = getattr(self.bus, self._valid_signal) for sig in self._signals+self._optional_signals: