From dd3de8a127fa8d5ce46c2503db35396448b2371e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 13 Feb 2008 19:04:19 +0000 Subject: [PATCH] Make partition detection code on windows a little more robust --- src/libprs500/devices/prs505/driver.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libprs500/devices/prs505/driver.py b/src/libprs500/devices/prs505/driver.py index a23cbb717e..702bb9d3ca 100644 --- a/src/libprs500/devices/prs505/driver.py +++ b/src/libprs500/devices/prs505/driver.py @@ -100,8 +100,6 @@ class PRS505(Device): @classmethod def is_device(cls, device_id): - 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: @@ -144,7 +142,7 @@ class PRS505(Device): import wmi c = wmi.WMI() for drive in c.Win32_DiskDrive(): - if self.__class__.is_device(drive.PNPDeviceID): + if self.__class__.is_device(str(drive.PNPDeviceID)): if drive.Partitions == 0: continue try: