From 436a4da6498ccbcf6427ceae03420188c5c48539 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 26 May 2019 10:20:03 +0530 Subject: [PATCH] Fix a regression when porting udisks.py --- src/calibre/devices/udisks.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/calibre/devices/udisks.py b/src/calibre/devices/udisks.py index 2efd9ca104..36729b871d 100644 --- a/src/calibre/devices/udisks.py +++ b/src/calibre/devices/udisks.py @@ -8,7 +8,7 @@ __docformat__ = 'restructuredtext en' import os, re -from polyglot.builtins import unicode_type, as_bytes, as_unicode +from polyglot.builtins import unicode_type, as_unicode def node_mountpoint(node): @@ -106,7 +106,7 @@ class UDisks2(object): try: device = bd.Get(self.BLOCK, 'Device', dbus_interface='org.freedesktop.DBus.Properties') - device = bytearray(as_bytes(device)).replace(b'\x00', b'').decode('utf-8') + device = bytearray(device).replace(b'\x00', b'').decode('utf-8') except Exception: device = None @@ -116,15 +116,15 @@ class UDisks2(object): # Enumerate all devices known to UDisks devs = self.bus.get_object('org.freedesktop.UDisks2', '/org/freedesktop/UDisks2/block_devices') - xml = devs.Introspect(dbus_interface='org.freedesktop.DBus.Introspectable') - for dev in re.finditer(r'name=[\'"](.+?)[\'"]', unicode_type(xml)): + xml = unicode_type(devs.Introspect(dbus_interface='org.freedesktop.DBus.Introspectable')) + for dev in re.finditer(r'name=[\'"](.+?)[\'"]', xml): bd = self.bus.get_object('org.freedesktop.UDisks2', - '/org/freedesktop/UDisks2/block_devices/%s2'%dev.group(1)) + '/org/freedesktop/UDisks2/block_devices/%s'%dev.group(1)) try: device = bd.Get(self.BLOCK, 'Device', dbus_interface='org.freedesktop.DBus.Properties') - device = bytearray(as_bytes(device)).replace(b'\x00', b'').decode('utf-8') - except: + device = bytearray(device).replace(b'\x00', b'').decode('utf-8') + except Exception: device = None if device == device_node_path: return bd