From 294eac19fe05926dfce143377fc69e5904386fbd Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Sun, 21 Feb 2016 17:33:45 +0100 Subject: [PATCH] pdq2.mediator: cleanup/style --- artiq/devices/pdq2/mediator.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/artiq/devices/pdq2/mediator.py b/artiq/devices/pdq2/mediator.py index 4d8bb65ff..c0c13a18f 100644 --- a/artiq/devices/pdq2/mediator.py +++ b/artiq/devices/pdq2/mediator.py @@ -1,5 +1,4 @@ -from artiq.language.core import * -from artiq.language.units import * +from artiq.language import * frame_setup = 20*ns @@ -63,8 +62,8 @@ class _Segment: if not self.frame.pdq.armed: raise ArmError() # If a frame is currently being played, check that we are next. - if (self.frame.pdq.current_frame >= 0 - and self.frame.pdq.next_segment != self.segment_number): + if (self.frame.pdq.current_frame >= 0 and + self.frame.pdq.next_segment != self.segment_number): raise SegmentSequenceError() self.frame.advance()