From 904966365f2cbbd133da916428accb761cc7f5a3 Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Thu, 15 Jan 2015 18:19:24 +0200 Subject: [PATCH] recv: use finally for exit code --- amodem/recv.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/amodem/recv.py b/amodem/recv.py index 2fc137f..83128ee 100644 --- a/amodem/recv.py +++ b/amodem/recv.py @@ -217,7 +217,6 @@ def main(config, src, dst, dump_audio=None, pylab=None): pylab = pylab or common.Dummy() detector = detect.Detector(config=config, pylab=pylab) receiver = Receiver(config=config, pylab=pylab) - success = False try: log.info('Waiting for carrier tone: %.1f kHz', config.Fc / 1e3) signal, amplitude, freq_error = detector.run(signal) @@ -230,10 +229,10 @@ def main(config, src, dst, dump_audio=None, pylab=None): sampler = sampling.Sampler(signal, sampling.Interpolator(), freq=freq) receiver.run(sampler, gain=1.0/amplitude, output=dst) - success = True + return True except Exception: log.exception('Decoding failed') - - dst.flush() - receiver.report() - return success + return False + finally: + dst.flush() + receiver.report()