# HG changeset patch
# User Tassilo Philipp
# Date 1586544108 -7200
# Node ID 622914f1f3bffcaca98ec5992a81c0d13e1c4735
# Parent  baf087cf5971f7f9b69d55503cac00fa0bcde1ba
- some cleanups

diff -r baf087cf5971 -r 622914f1f3bf python/pydc/pydcext.c
--- a/python/pydc/pydcext.c	Fri Apr 10 20:35:19 2020 +0200
+++ b/python/pydc/pydcext.c	Fri Apr 10 20:41:48 2020 +0200
@@ -75,7 +75,7 @@
 	void* libhandle;
 
 	if (!PyArg_ParseTuple(args,"s", &libpath))
-		return PyErr_Format(PyExc_RuntimeError, "libpath argument (string) missing");
+		return PyErr_Format(PyExc_RuntimeError, "libpath argument (str) missing");
 
 	libhandle = dlLoadLibrary(libpath);
 
@@ -196,7 +196,7 @@
 						Py_UCS4 cu;
 						if (PyUnicode_GET_LENGTH(po) != 1)
 #endif
-							return PyErr_Format( PyExc_RuntimeError, "arg %d - expecting a string with length of 1 (a char string)", pos );
+							return PyErr_Format( PyExc_RuntimeError, "arg %d - expecting a str with length of 1 (a char string)", pos );
 
 #if (PY_VERSION_HEX < 0x03030000)
 						cu = PyUnicode_AS_UNICODE(po)[0];
@@ -205,7 +205,7 @@
 #endif
 						// check against UCHAR_MAX in every case b/c Py_UCS4 is unsigned
 						if ( (cu > UCHAR_MAX))
-							return PyErr_Format( PyExc_RuntimeError, "arg %d out of range - expecting a char code", pos ); //@@@ error message needs to specify python types
+							return PyErr_Format( PyExc_RuntimeError, "arg %d out of range - expecting a char code", pos );
 						c = (DCchar) cu;
 					}
 					else if ( DcPyString_Check(po) )
@@ -214,7 +214,7 @@
 						char* s;
 						l = DcPyString_GET_SIZE(po);
 						if (l != 1)
-							return PyErr_Format( PyExc_RuntimeError, "arg %d - expecting a string with length of 1 (a char string)", pos );
+							return PyErr_Format( PyExc_RuntimeError, "arg %d - expecting a str with length of 1 (a char string)", pos );
 						s = DcPyString_AsString(po);
 						c = (DCchar) s[0];
 					}
@@ -311,7 +311,7 @@
 				else if ( PyLong_Check(po) )
 					p = (DCpointer) PyLong_AsVoidPtr(po);
 				else
-					return PyErr_Format( PyExc_RuntimeError, "arg %d - expecting a promoting pointer-type (int,string)", pos ); //@@@ error message could be better
+					return PyErr_Format( PyExc_RuntimeError, "arg %d - expecting a promoting pointer-type (int,str)", pos );
 				dcArgPointer(gpCall, p);
 				Py_XDECREF(bo);
 			}
@@ -327,7 +327,7 @@
 				} else if ( DcPyString_Check(po) ) {
 					p = DcPyString_AsString(po);
 				} else
-					return PyErr_Format( PyExc_RuntimeError, "arg %d - expecting a string", pos );
+					return PyErr_Format( PyExc_RuntimeError, "arg %d - expecting a str", pos );
 				dcArgPointer(gpCall, (DCpointer) p);
 				Py_XDECREF(bo);
 			}