From eed245a7607a08d44d6eed8cb23ede2a5a11d243 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 15 Aug 2009 10:00:00 -0600 Subject: [PATCH] Fix #3160 (Sony PRS-505 not recognised since 0.6.7 installation) --- src/calibre/devices/usbms/device.py | 6 +----- src/calibre/utils/PythonMagickWand.py | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py index 13085c5c70..17b02119c4 100644 --- a/src/calibre/devices/usbms/device.py +++ b/src/calibre/devices/usbms/device.py @@ -42,7 +42,6 @@ class Device(DeviceConfig, DevicePlugin): WINDOWS_MAIN_MEM = None WINDOWS_CARD_A_MEM = None WINDOWS_CARD_B_MEM = None - ALLOW_NO_MAIN_MEMORY = False # The following are used by the check_ioreg_line method and can be either: # None, a string, a list of strings or a compiled regular expression @@ -267,9 +266,6 @@ class Device(DeviceConfig, DevicePlugin): drives['cardb'] = self.windows_get_drive_prefix(drive) elif self.windows_match_device(drive, 'WINDOWS_MAIN_MEM') and not drives.get('main', None): drives['main'] = self.windows_get_drive_prefix(drive) - if not self.ALLOW_NO_MAIN_MEMORY: - raise DeviceError('Failed to find the drive corresponding' - ' to the main memory') if 'main' in drives.keys() and 'carda' in drives.keys() and \ 'cardb' in drives.keys(): @@ -277,7 +273,7 @@ class Device(DeviceConfig, DevicePlugin): drives = self.windows_open_callback(drives) - if 'main' not in drives: + if drives.get('main', None) is None: raise DeviceError( _('Unable to detect the %s disk drive. Try rebooting.') % self.__class__.__name__) diff --git a/src/calibre/utils/PythonMagickWand.py b/src/calibre/utils/PythonMagickWand.py index 637f11da87..abbc46bc9d 100644 --- a/src/calibre/utils/PythonMagickWand.py +++ b/src/calibre/utils/PythonMagickWand.py @@ -83,7 +83,8 @@ else: if _lib is None: _lib = util.find_library('Wand') -_magick = _magick_error = None +_magick = None +_magick_error = None try: _magick = ctypes.CDLL(_lib) except Exception, err: