From aa22188fe3b2656a72616277b6d34bd448a86ada Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sun, 12 Nov 2023 16:35:38 +0300 Subject: [PATCH] Fix(Py3): Encode unicode to bytes --- Robots/bkmk_robot_base.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Robots/bkmk_robot_base.py b/Robots/bkmk_robot_base.py index fb8bb2d..9a74cb4 100644 --- a/Robots/bkmk_robot_base.py +++ b/Robots/bkmk_robot_base.py @@ -111,9 +111,15 @@ class robot_base(Robot): md5 = md5wrapper() if url_type == "ftp": # Pass welcome message through MD5 - md5.update(self.get_ftp_welcome()) + ftp_welcome = self.get_ftp_welcome() + if not isinstance(ftp_welcome, bytes): + ftp_welcome = ftp_welcome.encode('utf-8') + md5.update(ftp_welcome) - md5.update(content) + if isinstance(content, bytes): + md5.update(content) + else: + md5.update(content.encode('utf-8')) bookmark.md5 = str(md5) if headers: @@ -195,6 +201,8 @@ class robot_base(Robot): self.log(" non-image content type," " assume x-icon") content_type = 'image/x-icon' + if not isinstance(icon_data, bytes): + icon_data = icon_data.encode('utf-8') bookmark.icon = "data:%s;base64,%s" \ % (content_type, b64encode(icon_data)) icons[icon_url] = (content_type, -- 2.39.2