Correct type for Windows Registry check

Author: bridadan

mbed_lstools/windows.py

@@ -176,10 +176,10 @@ def get_mbed_devices(self):
         mounts_key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, 'SYSTEM\MountedDevices')
         for point, label, _ in self.iter_vals(mounts_key):
             printable_label = label.decode('utf-16le', 'ignore')
-            if (b'DosDevices' in point and
+            if ('DosDevices' in point and
                 any(v in printable_label.upper() for v in upper_ven)):
                 logger.debug("Found Mount point %s with usb ID %s",point,
                              printable_label)
-                yield (point.decode('utf-8', 'ignore'), printable_label)
+                yield (point, printable_label)
             else:
                 logger.debug("Skipping Mount point %r label %r", point, label)

test/os_win7.py

@@ -105,9 +105,9 @@ def query_info_key(key):
     def test_one_nucleo_dev(self):
         value_dict = {
             (None, 'SYSTEM\MountedDevices'): [
-                (b'\\DosDevices\\F:',
+                ('\\DosDevices\\F:',
                  u'_??_USBSTOR#Disk&Ven_MBED&Prod_VFS&Rev_0.1#0240000032044e4500367009997b00086781000097969900&0#{53f56307-b6bf-11d0-94f2-00a0c91efb8b}'.encode('utf-16le')),
-                (b'\\DosDevices\\D:',
+                ('\\DosDevices\\D:',
                  u'_??_USBSTOR#Disk&Ven_SEGGER&Prod_MSD_Volume&Rev_1.00#8&1b8e102b&0&000440035522&0#{53f56307-b6bf-11d0-94f2-00a0c91efb8b}'.encode('utf-16le'))],
             ((((((None, 'SYSTEM\CurrentControlSet\Enum'), 'USB'),
                 'VID_0416&PID_511E'), '000440035522'), 'Device Parameters'), 'PortName'): ('COM7', None)