PyMapping_Check to PyUnicode_Check

grrrr · May 11, 2018 · 3908b2b · 3908b2b
1 parent f807ad6
commit 3908b2b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/source/clmeth.cpp b/source/clmeth.cpp
@@ -126,7 +126,7 @@ PyObject* pyext::pyext_getattr(PyObject *,PyObject *args)
         ERRINTERNAL();
     }
 
-    if(PyMapping_Check(name)) {
+    if(PyUnicode_Check(name)) {
         char* sname = PyUnicode_AsUTF8(name);
         if(sname) {
 #ifdef FLEXT_THREADS
@@ -195,7 +195,7 @@ PyObject *pyext::pyext_outlet(PyObject *,PyObject *args)
         if(sz == 3) {
             val = PyTuple_GET_ITEM(args,2); // borrow reference
             Py_INCREF(val);
-            tp = PySequence_Check(val);
+            tp = PyInstance_Check(val);
         }
         else
             tp = false;

diff --git a/source/pyargs.cpp b/source/pyargs.cpp
@@ -126,7 +126,7 @@ PyObject *pybase::MakePyArg(const t_symbol *s,int argc,const t_atom *argv)
 
 inline bool issym(PyObject *p)
 {
-    return PyMapping_Check(p) || pySymbol_Check(p);
+    return PyUnicode_Check(p) || pySymbol_Check(p);
 }
 
 inline bool isseq(PyObject *p)
@@ -140,7 +140,7 @@ const t_symbol *pybase::getone(t_atom &at,PyObject *arg)
     else if(PyLong_Check(arg)) { flext::SetInt(at,PyLong_AsLong(arg)); return sym_fint; }
     else if(PyFloat_Check(arg)) { flext::SetFloat(at,(float)PyFloat_AsDouble(arg)); return flext::sym_float; }
     else if(pySymbol_Check(arg)) { flext::SetSymbol(at,pySymbol_AS_SYMBOL(arg)); return flext::sym_symbol; }
-    else if(PyMapping_Check(arg)) { flext::SetString(at,PyUnicode_AsUTF8(arg)); return flext::sym_symbol; }
+    else if(PyUnicode_Check(arg)) { flext::SetString(at,PyUnicode_AsUTF8(arg)); return flext::sym_symbol; }
     else {
         PyObject *tp = PyObject_Type(arg);
         PyObject *stp = tp?PyObject_Str(tp):NULL;

diff --git a/source/pybase.cpp b/source/pybase.cpp
@@ -349,7 +349,7 @@ void pybase::m__doc(PyObject *obj)
         ThrLock lock;
 
         PyObject *docf = PyDict_GetItemString(obj,"__doc__"); // borrowed!!!
-        if(docf && PyMapping_Check(docf)) {
+        if(docf && PyUnicode_Check(docf)) {
 
             post("");
             const char *s = PyUnicode_AsUTF8(docf);

diff --git a/source/pybuffer.cpp b/source/pybuffer.cpp
@@ -105,7 +105,7 @@ static int buffer_init(PyObject *obj, PyObject *args, PyObject *kwds)
 
     if(pySymbol_Check(arg))
         self->sym = pySymbol_AS_SYMBOL(arg);
-    else if(PyMapping_Check(arg))
+    else if(PyUnicode_Check(arg))
         self->sym = flext::MakeSymbol(PyUnicode_AsUTF8(arg));
     else
         ret = -1;

diff --git a/source/pysymbol.cpp b/source/pysymbol.cpp
@@ -32,7 +32,7 @@ static int symbol_init(PyObject *self, PyObject *args, PyObject *kwds)
 
     if(pySymbol_Check(arg))
         ((pySymbol *)self)->sym = pySymbol_AS_SYMBOL(arg);
-    else if(PyMapping_Check(arg))
+    else if(PyUnicode_Check(arg))
         ((pySymbol *)self)->sym = flext::MakeSymbol(PyUnicode_AsUTF8(arg));
     else {
         PyErr_SetString(PyExc_TypeError,"string or symbol argument expected");

diff --git a/source/pysymbol.h b/source/pysymbol.h
@@ -81,7 +81,7 @@ inline const char *pySymbol_AS_STRING(PyObject *op)
 
 inline const t_symbol *pyObject_AsSymbol(PyObject *op)
 {
-    if(PyMapping_Check(op))
+    if(PyUnicode_Check(op))
         return flext::MakeSymbol(PyUnicode_AsUTF8(op));
     else
         return pySymbol_AsSymbol(op);