From 72eb41b24f12b572d55081042160954b93f4614c Mon Sep 17 00:00:00 2001
From: jreinhardt <jreinhardt@ist-dein-freund.de>
Date: Tue, 20 Oct 2020 15:21:09 +0200
Subject: [PATCH] Fix macro code processing

I believe this code is currently incorrect, as it makes references to code outside the "if code" block, where it can not be ensured that code is a string. Moving the code processing into this block avoids this issue.

I experienced a stuck Addon Manager, which was caused by an exception

```
  File "/usr/share/freecad/Mod/AddonManager/addonmanager_macro.py", line ..., in fill_details_from_wiki
    FreeCAD.Console.PrintWarning(translate("AddonsInstaller", "Unable to clean macro code: ") + code + '\n')
TypeError: can only concatenate str (not "list") to str
```
which is fixed by these changes.

OS: Ubuntu 20.04.1 LTS
Word size of OS: 64-bit
Word size of FreeCAD: 64-bit
Version: 0.18.4.
Build type: Release
Python version: 3.8.2
Qt version: 5.12.5
Coin version: 4.0.0
OCC version: 7.3.0
Locale: English/United States (en_US)
---
 src/Mod/AddonManager/addonmanager_macro.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Mod/AddonManager/addonmanager_macro.py b/src/Mod/AddonManager/addonmanager_macro.py
index a71c99a56f75..45cb7cafe8e3 100644
--- a/src/Mod/AddonManager/addonmanager_macro.py
+++ b/src/Mod/AddonManager/addonmanager_macro.py
@@ -143,19 +143,19 @@ def fill_details_from_wiki(self, url):
         if not code:
             code = re.findall(r"<pre>(.*?)</pre>", p.replace("\n", "--endl--"))
             if code:
-                # code = code[0]
                 # take the biggest code block
                 code = sorted(code, key=len)[-1]
                 code = code.replace("--endl--", "\n")
+                # Clean HTML escape codes.
+                if sys.version_info.major < 3:
+                    code = code.decode("utf8")
+                code = unescape(code)
+                code = code.replace(b"\xc2\xa0".decode("utf-8"), " ")
+                if sys.version_info.major < 3:
+                    code = code.encode("utf8")
             else:
                 FreeCAD.Console.PrintWarning(translate("AddonsInstaller", "Unable to fetch the code of this macro."))
-            # Clean HTML escape codes.
-            if sys.version_info.major < 3:
-                code = code.decode("utf8")
-            code = unescape(code)
-            code = code.replace(b"\xc2\xa0".decode("utf-8"), " ")
-            if sys.version_info.major < 3:
-                code = code.encode("utf8")
+
         desc = re.findall(r"<td class=\"ctEven left macro-description\">(.*?)</td>", p.replace("\n", " "))
         if desc:
             desc = desc[0]