From 96c71e7ae4eb74f96f405ef9b43656e5d365a97a Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Thu, 8 Aug 2019 21:43:33 -0400 Subject: [PATCH] QbyteArray().data() is always bytes and does not need to be cast to it a dbus.ByteArray() can simply be initialized from the QByteArray directly. --- src/calibre/ebooks/__init__.py | 2 +- src/calibre/ebooks/pdf/render/serialize.py | 2 +- src/calibre/gui2/__init__.py | 2 +- src/calibre/gui2/dbus_export/utils.py | 2 +- src/calibre/gui2/library/alternate_views.py | 2 +- src/calibre/utils/wmf/__init__.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/calibre/ebooks/__init__.py b/src/calibre/ebooks/__init__.py index 87e017f12d..34b5904d8f 100644 --- a/src/calibre/ebooks/__init__.py +++ b/src/calibre/ebooks/__init__.py @@ -67,7 +67,7 @@ class HTMLRenderer(object): buf = QBuffer(ba) buf.open(QBuffer.WriteOnly) image.save(buf, 'JPEG') - self.data = bytes(ba.data()) + self.data = ba.data() except Exception as e: self.exception = e self.traceback = traceback.format_exc() diff --git a/src/calibre/ebooks/pdf/render/serialize.py b/src/calibre/ebooks/pdf/render/serialize.py index dae0cd773a..492edaacb6 100644 --- a/src/calibre/ebooks/pdf/render/serialize.py +++ b/src/calibre/ebooks/pdf/render/serialize.py @@ -464,7 +464,7 @@ class PDFStream(object): ba = QByteArray() buf = QBuffer(ba) image.save(buf, 'jpeg', 94) - data = bytes(ba.data()) + data = ba.data() if has_alpha: soft_mask = self.write_image(tmask, w, h, 8) diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index e656ca1386..2c7815716c 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -687,7 +687,7 @@ def pixmap_to_data(pixmap, format='JPEG', quality=None): buf = QBuffer(ba) buf.open(QBuffer.WriteOnly) pixmap.save(buf, format, quality=quality) - return bytes(ba.data()) + return ba.data() def decouple(prefix): diff --git a/src/calibre/gui2/dbus_export/utils.py b/src/calibre/gui2/dbus_export/utils.py index 722dab73e4..e1245782c6 100644 --- a/src/calibre/gui2/dbus_export/utils.py +++ b/src/calibre/gui2/dbus_export/utils.py @@ -128,7 +128,7 @@ def icon_to_dbus_menu_icon(icon, size=32): buf = QBuffer(ba) buf.open(QBuffer.WriteOnly) icon.pixmap(32).save(buf, 'PNG') - return dbus.ByteArray(bytes((ba.data()))) + return dbus.ByteArray(ba) def setup_for_cli_run(): diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py index 08cb1b6e64..bf78e5791e 100644 --- a/src/calibre/gui2/library/alternate_views.py +++ b/src/calibre/gui2/library/alternate_views.py @@ -76,7 +76,7 @@ def image_to_data(image): # {{{ buf.open(QBuffer.WriteOnly) if not image.save(buf, CACHE_FORMAT): raise EncodeError('Failed to encode thumbnail') - ret = bytes(ba.data()) + ret = ba.data() buf.close() return ret # }}} diff --git a/src/calibre/utils/wmf/__init__.py b/src/calibre/utils/wmf/__init__.py index ee9b608729..d8f7e34800 100644 --- a/src/calibre/utils/wmf/__init__.py +++ b/src/calibre/utils/wmf/__init__.py @@ -68,4 +68,4 @@ def to_png(bmp): buf = QBuffer(ba) buf.open(QBuffer.WriteOnly) i.save(buf, 'png') - return bytes(ba.data()) + return ba.data()