Py3: make string concatenation to work with Py2 and Py3

FreeCAD · Mar 18, 2019 · 3471564 · 3471564
1 parent 3cf15c0
commit 3471564
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Gui/OnlineDocumentation.cpp b/src/Gui/OnlineDocumentation.cpp
@@ -116,7 +116,7 @@ QByteArray PythonOnlineHelp::loadResource(const QString& filename) const
         dict = PyDict_Copy(dict);
 
         QByteArray cmd =
-            "import string, os, sys, pydoc, pkgutil\n"
+            "import os, sys, pydoc, pkgutil\n"
             "\n"
             "class FreeCADDoc(pydoc.HTMLDoc):\n"
             "    def index(self, dir, shadowed=None):\n"
@@ -160,7 +160,7 @@ QByteArray PythonOnlineHelp::loadResource(const QString& filename) const
             "    ret = pydoc.html.index(dir, seen)\n"
             "    if ret != None:\n"
             "        indices.append(ret)\n"
-            "contents = heading + string.join(indices) + '''<p align=right>\n"
+            "contents = heading + ' '.join(indices) + '''<p align=right>\n"
             "<font color=\"#909090\" face=\"helvetica, arial\"><strong>\n"
             "pydoc</strong> by Ka-Ping Yee &lt;ping@lfw.org&gt;</font>'''\n"
             "htmldocument=pydoc.html.page(title,contents)\n";