From f875775fdbf6c764161fc3ecbafdd005a5eab657 Mon Sep 17 00:00:00 2001 From: lorenz Date: Sat, 5 Jan 2019 14:50:25 +0100 Subject: [PATCH] py3: AddonManager-macro: use unicode proposal from here: https://forum.freecadweb.org/viewtopic.php?f=3&t=33172&start=10#p278156 --- src/Mod/AddonManager/addonmanager_macro.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mod/AddonManager/addonmanager_macro.py b/src/Mod/AddonManager/addonmanager_macro.py index 61e6980898..4e3b474b56 100644 --- a/src/Mod/AddonManager/addonmanager_macro.py +++ b/src/Mod/AddonManager/addonmanager_macro.py @@ -120,11 +120,11 @@ class Macro(object): data = u2.read(block) if not data: break + if sys.version_info.major >= 3 and isinstance(data, bytes): + data = data.decode('utf-8') response += data if response: code = response - if sys.version_info.major >= 3 and isinstance(code, bytes): - code = code.decode('utf-8') u2.close() if not code: code = re.findall('
(.*?)<\/pre>', p.replace('\n', '--endl--'))