From 9f5e97d14be6b0063357e96e301318eabcf2cd09 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Mon, 10 Jan 2011 23:18:12 +0100 Subject: [PATCH] Make all tests pass without having pyserial installed --- mopidy/mixers/denon.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mopidy/mixers/denon.py b/mopidy/mixers/denon.py index e6d752b6..f0712f95 100644 --- a/mopidy/mixers/denon.py +++ b/mopidy/mixers/denon.py @@ -1,8 +1,6 @@ import logging from threading import Lock -from serial import Serial - from mopidy import settings from mopidy.mixers.base import BaseMixer @@ -33,8 +31,11 @@ class DenonMixer(BaseMixer): """ super(DenonMixer, self).__init__(*args, **kwargs) device = kwargs.get('device', None) - self._device = device or Serial(port=settings.MIXER_EXT_PORT, - timeout=0.2) + if device: + self._device = device + else: + from serial import Serial + self._device = Serial(port=settings.MIXER_EXT_PORT, timeout=0.2) self._levels = ['99'] + ["%(#)02d" % {'#': v} for v in range(0, 99)] self._volume = 0 self._lock = Lock()