From d4e4af52e7da854a350a4b357d81e6ac5f86ed15 Mon Sep 17 00:00:00 2001
From: Markus Lampert <markus@bibi.ca>
Date: Wed, 21 Jun 2017 11:41:15 -0700
Subject: [PATCH] Changing c-py interface to use 's' instead of 'S' for py 2/3
 compatibility; also makes the code simpler.

---
 src/Mod/Path/App/ToolPy.xml         |  2 +-
 src/Mod/Path/App/TooltablePyImp.cpp | 23 +++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/Mod/Path/App/ToolPy.xml b/src/Mod/Path/App/ToolPy.xml
index 647c7aeb3a..58b0b99cf4 100644
--- a/src/Mod/Path/App/ToolPy.xml
+++ b/src/Mod/Path/App/ToolPy.xml
@@ -88,7 +88,7 @@ HighCarbonToolSteel CastAlloy, Ceramics, Diamond, Sialon or Undefined</UserDocu>
         </Methode>
         <Methode Name="fromTemplate">
             <Documentation>
-                <UserDocu>fills receiver with values from the template string</UserDocu>
+                <UserDocu>fromTemplate(xmlString) ... fills receiver with values from the template string</UserDocu>
             </Documentation>
         </Methode>
         <!--<ClassDeclarations>
diff --git a/src/Mod/Path/App/TooltablePyImp.cpp b/src/Mod/Path/App/TooltablePyImp.cpp
index f0ad0c55be..8186da219c 100644
--- a/src/Mod/Path/App/TooltablePyImp.cpp
+++ b/src/Mod/Path/App/TooltablePyImp.cpp
@@ -330,19 +330,18 @@ PyObject* ToolPy::copy(PyObject * args)
 
 PyObject* ToolPy::fromTemplate(PyObject * args)
 {
-    PyObject *pcObj;
-    if (PyArg_ParseTuple(args, "S", &pcObj)) {
-        if (PyString_Check(pcObj)) {
-            // embed actual string in dummy tag so XMLReader can consume that on construction
-            std::ostringstream os;
-            os << "<snippet>" << PyString_AsString(pcObj) << "</snippet>";
-            std::istringstream is(os.str());
-            Base::XMLReader reader("", is);
-            getToolPtr()->Restore(reader);
-            Py_Return ;
-        }
+    char *pstr = 0;
+    if (PyArg_ParseTuple(args, "s", &pstr)) {
+        // embed actual string in dummy tag so XMLReader can consume that on construction
+        std::ostringstream os;
+        os << "<snippet>" << pstr <<  "</snippet>";
+        std::istringstream is(os.str());
+        Base::XMLReader reader("", is);
+        getToolPtr()->Restore(reader);
+        Py_Return ;
     }
-    throw Py::Exception("only string argument accepted.");
+    PyErr_SetString(PyExc_TypeError, "argument must be a string");
+    return 0;
 }