From 1fa831703d4264786684ad28adb37507e9b6f281 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 20 Jan 2009 13:56:27 -0800 Subject: [PATCH] IGN:... --- src/calibre/devices/usbms/device.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py index ef2800b1cc..f5c176bcdb 100644 --- a/src/calibre/devices/usbms/device.py +++ b/src/calibre/devices/usbms/device.py @@ -188,8 +188,8 @@ class Device(_Device): if not drives: raise DeviceError(_('Unable to detect the %s disk drive. Try rebooting.') % self.__class__.__name__) - self._main_prefix = drives['main'] if 'main' in names.keys() else None - self._card_prefix = drives['card'] if 'card' in names.keys() else None + self._main_prefix = drives.get('main', None) + self._card_prefix = drives.get('card', None) @classmethod def get_osx_mountpoints(self, raw=None): @@ -197,7 +197,8 @@ class Device(_Device): ioreg = '/usr/sbin/ioreg' if not os.access(ioreg, os.X_OK): ioreg = 'ioreg' - raw = subprocess.Popen((ioreg+' -w 0 -S -c IOMedia').split(), stdout=subprocess.PIPE).stdout.read() + raw = subprocess.Popen((ioreg+' -w 0 -S -c IOMedia').split(), + stdout=subprocess.PIPE).stdout.read() lines = raw.splitlines() names = {}