From 6a4aec5fa5cb411cc805717f212858bad1e92e04 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 13 Feb 2008 19:02:30 +0000 Subject: [PATCH] Make partition detection code on windows a little more robust --- src/libprs500/devices/prs505/driver.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/libprs500/devices/prs505/driver.py b/src/libprs500/devices/prs505/driver.py index 1cef0a3324..a23cbb717e 100644 --- a/src/libprs500/devices/prs505/driver.py +++ b/src/libprs500/devices/prs505/driver.py @@ -100,14 +100,17 @@ class PRS505(Device): @classmethod def is_device(cls, device_id): - if 'VEN_'+cls.VENDOR_NAME in device_id.upper() and \ - 'PROD_'+cls.PRODUCT_NAME in device_id.upper(): + if not hasattr(device_id, 'upper'): + return False + device_id = device_id.upper() + if 'VEN_'+cls.VENDOR_NAME in device_id and \ + 'PROD_'+cls.PRODUCT_NAME in device_id: return True vid, pid = hex(cls.VENDOR_ID)[2:], hex(cls.PRODUCT_ID)[2:] if len(vid) < 4: vid = '0'+vid if len(pid) < 4: pid = '0'+pid - if 'VID_'+vid in device_id.upper() and \ - 'PID_'+pid in device_id.upper(): + if 'VID_'+vid in device_id and \ + 'PID_'+pid in device_id: return True return False