aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Draxinger <Wolfgang.Draxinger@draxit.de>2011-12-01 11:18:19 +0100
committerWolfgang Draxinger <Wolfgang.Draxinger@draxit.de>2011-12-01 11:18:19 +0100
commit55c51eb22ba06ca905a5ccb01eb72009831ebfe4 (patch)
tree07c8f140ffa1e95c9c64aa34cc26aeda957b936e
parentb000e6b80728bd536adccd137f0680391bcb372f (diff)
downloadPyPhytron-55c51eb22ba06ca905a5ccb01eb72009831ebfe4.tar.gz
PyPhytron-55c51eb22ba06ca905a5ccb01eb72009831ebfe4.tar.bz2
ExtendedStatus.__str__ not uses Class.__str__ to build simplestatus_str
-rw-r--r--Phytron.py19
1 files changed, 2 insertions, 17 deletions
diff --git a/Phytron.py b/Phytron.py
index 8358fb7..20395a3 100644
--- a/Phytron.py
+++ b/Phytron.py
@@ -131,22 +131,7 @@ class ExtendedStatus(Status):
def __str__(self):
status = list()
- if self.coldboot:
- status += ['Cold Boot']
- if self.any_error:
- status += ['Any Error']
- if self.rx_error:
- status += ['RX Error']
- if self.SFI_error:
- status += ['SFI Error']
- if self.outputstage_error:
- status += ['Output Stage Error']
- if self.initiator_minus:
- status += ['Initiator -']
- if self.initiator_plus:
- status += ['Initiator +']
- if self.running:
- status += ['Running']
+ simplestatus_str = Status.__str__(self)[1:-1]
if self.checksum_error:
status += ["Checksum Error"]
if self.rxbuffer_overrun:
@@ -187,7 +172,7 @@ class ExtendedStatus(Status):
status += ["HW Disable"]
if self.initializing:
status += ["Initialzing"]
- return '{' + ('|'.join(status)) +'}'
+ return '{' + '|'.join((simplestatus_str, '|'.join(status))) +'}'
class ReceiveData:
def __init__(self, ID, status, data):