From 8abda88d4a4acccd44e30af68db8d679052846f7 Mon Sep 17 00:00:00 2001
From: WandererFan <wandererfan@gmail.com>
Date: Thu, 17 Nov 2016 09:48:46 -0500
Subject: [PATCH] Fix error handling

---
 src/Mod/TechDraw/App/AppTechDrawPy.cpp | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/Mod/TechDraw/App/AppTechDrawPy.cpp b/src/Mod/TechDraw/App/AppTechDrawPy.cpp
index e497331a82..a684bee4b0 100644
--- a/src/Mod/TechDraw/App/AppTechDrawPy.cpp
+++ b/src/Mod/TechDraw/App/AppTechDrawPy.cpp
@@ -120,9 +120,7 @@ private:
         PyObject *pcObj;
         PyObject *inclBig = Py_True;
         if (!PyArg_ParseTuple(args.ptr(), "O!|O", &(PyList_Type), &pcObj, &inclBig)) {
-            std::string error = std::string("expected List, not ");
-            error += pcObj->ob_type->tp_name;
-            throw Base::TypeError(error);
+            throw Py::Exception("expected (listofedges,boolean");
         }
 
         std::vector<TopoDS_Edge> edgeList;
@@ -179,9 +177,7 @@ private:
     {
         PyObject *pcObj;
         if (!PyArg_ParseTuple(args.ptr(), "O!", &(PyList_Type), &pcObj)) {
-            std::string error = std::string("expected List, not ");
-            error += pcObj->ob_type->tp_name;
-            throw Base::TypeError(error);
+            throw Py::Exception("expected (listofedges)");
         }
 
         std::vector<TopoDS_Edge> edgeList;
@@ -238,19 +234,15 @@ private:
         if (!PyArg_ParseTuple(args.ptr(), "OdO", &pcObjShape,
                                                  &scale,
                                                  &pcObjDir)) {
-            throw Py::Exception();
+            throw Py::Exception("expected (shape,scale,direction");
         }
 
         if (!PyObject_TypeCheck(pcObjShape, &(TopoShapePy::Type))) {
-            std::string error = std::string("type(1) must be 'Shape', not ");
-            error += pcObjShape->ob_type->tp_name;
-            throw Base::TypeError(error);
+            throw Py::TypeError("expected arg1 to be 'Shape'");
         }
 
         if (!PyObject_TypeCheck(pcObjDir, &(Base::VectorPy::Type))) {
-            std::string error = std::string("type(3) must be 'Vector', not ");
-            error += pcObjDir->ob_type->tp_name;
-            throw Py::TypeError(error);
+            throw Py::TypeError("expected arg3 to be 'Vector'");
         }
 
         TopoShapePy* pShape = static_cast<TopoShapePy*>(pcObjShape);