fixed rich comparison method in Symbol class

fix for OSX
small cosmetic fixes
enable compiled-only scripts (without .py)
small changes for numpy support
fix for numpy headers on OS X
fix for numpy
added xcode 2.4 project
added pyext._list and pyext._tuple to convert input lists to Python sequence objects
fix numpy et al
enable module packages (module/__init__.py[co]), now also for Max

svn path=/trunk/; revision=7370

1 files changed, 24 insertions, 24 deletions

diff --git a/externals/grill/py/source/pysymbol.cpp b/externals/grill/py/source/pysymbol.cpp
index b5c5b127..2f023469 100644
--- a/externals/grill/py/source/pysymbol.cpp
+++ b/externals/grill/py/source/pysymbol.cpp
@@ -73,8 +73,8 @@ static PyObject *symbol_richcompare(PyObject *a,PyObject *b,int cmp)
         }

         return PyBool_FromLong(ret);

     }

-	Py_INCREF(Py_NotImplemented);
-	return Py_NotImplemented;
+	Py_INCREF(Py_NotImplemented);

+	return Py_NotImplemented;

 }

 

 static long symbol_hash(PyObject *self)

@@ -219,9 +219,9 @@ pySymbol *pySymbol_int;
 void initsymbol()

 {

     if(PyType_Ready(&pySymbol_Type) < 0)

-        FLEXT_ASSERT(false);

-    else

-        Py_INCREF(&pySymbol_Type);

+        return;

+

+	Py_INCREF(&pySymbol_Type);

 

     // initialize predefined objects

     pySymbol__ = symbol_newsym(flext::sym__);

@@ -233,22 +233,22 @@ void initsymbol()
 }

 

 

-PyObject *pySymbol_FromSymbol(const t_symbol *sym)
-{
-    pySymbol *op;
-    if(sym == flext::sym__)
-        Py_INCREF(op = pySymbol__);
-    else if(sym == flext::sym_bang)
-        Py_INCREF(op = pySymbol_bang);
-    else if(sym == flext::sym_list)
-        Py_INCREF(op = pySymbol_list);
-    else if(sym == flext::sym_symbol)
-        Py_INCREF(op = pySymbol_symbol);
-    else if(sym == flext::sym_float)
-        Py_INCREF(op = pySymbol_float);
-    else if(sym == flext::sym_int)
-        Py_INCREF(op = pySymbol_int);
-    else
-        op = symbol_newsym(sym);
-    return (PyObject *)op;
-}
+PyObject *pySymbol_FromSymbol(const t_symbol *sym)

+{

+    pySymbol *op;

+    if(sym == flext::sym__)

+        Py_INCREF(op = pySymbol__);

+    else if(sym == flext::sym_bang)

+        Py_INCREF(op = pySymbol_bang);

+    else if(sym == flext::sym_list)

+        Py_INCREF(op = pySymbol_list);

+    else if(sym == flext::sym_symbol)

+        Py_INCREF(op = pySymbol_symbol);

+    else if(sym == flext::sym_float)

+        Py_INCREF(op = pySymbol_float);

+    else if(sym == flext::sym_int)

+        Py_INCREF(op = pySymbol_int);

+    else

+        op = symbol_newsym(sym);

+    return (PyObject *)op;

+}