From 21cda9512f29947617da45822ab524b1f76f56c1 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Tue, 8 Jul 2014 21:32:32 +0200 Subject: Various PDs: Throw SamplerateError instead of Exception. Also, use the "if not self.samplerate" form, which catches both the case where self.samplerate is None, as well as the case where it is 0. --- decoders/uart/pd.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'decoders/uart') diff --git a/decoders/uart/pd.py b/decoders/uart/pd.py index ff8a516..da5e303 100644 --- a/decoders/uart/pd.py +++ b/decoders/uart/pd.py @@ -69,6 +69,9 @@ def parity_ok(parity_type, parity_bit, data, num_data_bits): else: raise Exception('Invalid parity type: %d' % parity_type) +class SamplerateError(Exception): + pass + class Decoder(srd.Decoder): api_version = 2 id = 'uart' @@ -327,8 +330,8 @@ class Decoder(srd.Decoder): self.putg([rxtx + 4, ['Stop bit', 'Stop', 'T']]) def decode(self, ss, es, data): - if self.samplerate is None: - raise Exception("Cannot decode without samplerate.") + if not self.samplerate: + raise SamplerateError('Cannot decode without samplerate.') for (self.samplenum, pins) in data: # Note: Ignoring identical samples here for performance reasons -- cgit v1.2.3-70-g09d2