Thu Jan 3 17:21:06 CET 2008

Update of /cvsroot/pure-data/externals/grill/py/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15572/source

Modified Files:
	bound.cpp clmeth.cpp main.cpp main.h modmeth.cpp py.cpp 
	pyargs.cpp pyatom.cpp pyatom.h pybase.cpp pybase.h 
	pybuffer.cpp pybuffer.h pybundle.cpp pybundle.h pydsp.cpp 
	pyext.cpp pyext.h pymeth.cpp pyprefix.h pysymbol.cpp 
	pysymbol.h register.cpp 
Log Message:
cross-platform fixes
enable compiled-only scripts (without .py)
use PyGILState_\*() functionality (enabled with PY_USE_GIL)
fixes for non-GIL usage
improved symbol comparison
buffer protocol adapted for Python 2.5
enable module packages (module/__init__.py[co]), now also for Max

Index: pyprefix.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pyprefix.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pyprefix.h	6 Jul 2007 21:44:56 -0000	1.7
--- pyprefix.h	3 Jan 2008 16:21:04 -0000	1.8
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python script object for PD and MaxMSP

! Copyright (c)2002-2007 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python script object for PD and MaxMSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

Index: main.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/main.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** main.cpp	8 Jul 2005 14:30:31 -0000	1.37
--- main.cpp	3 Jan 2008 16:21:03 -0000	1.38
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python external object for PD and MaxMSP

! Copyright (c)2002-2005 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python external object for PD and MaxMSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

Index: pyargs.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pyargs.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** pyargs.cpp	11 Aug 2005 15:00:58 -0000	1.23
--- pyargs.cpp	3 Jan 2008 16:21:04 -0000	1.24
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python external object for PD and MaxMSP

! Copyright (c)2002-2005 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python external object for PD and MaxMSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

Index: pyatom.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pyatom.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pyatom.h	7 Mar 2007 13:40:14 -0000	1.2
--- pyatom.h	3 Jan 2008 16:21:04 -0000	1.3
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2005 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

Index: pybase.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pybase.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** pybase.h	6 Jul 2007 21:44:56 -0000	1.14
--- pybase.h	3 Jan 2008 16:21:04 -0000	1.15
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python script object for PD and MaxMSP

! Copyright (c)2002-2007 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python script object for PD and MaxMSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

***************
*** 18,24 ****

  #ifdef PY_USE_GIL
! 	typedef PyGILState_STATE ThrState;
  #else
! 	typedef PyThreadState *ThrState;
  #endif

--- 20,26 ----

  #ifdef PY_USE_GIL
!     typedef PyGILState_STATE ThrState;
  #else
!     typedef PyThreadState *ThrState;
  #endif

***************
*** 27,39 ****
  {
  public:
! 	pybase();
! 	virtual ~pybase();

      void Exit();

! 	static PyObject *MakePyArgs(const t_symbol *s,int argc,const t_atom *argv,int inlet = -1);
! 	static PyObject *MakePyArg(const t_symbol *s,int argc,const t_atom *argv);
! 	static const t_symbol *GetPyArgs(AtomList &lst,PyObject *pValue,int offs = 0);
! 	static const t_symbol *GetPyAtom(AtomList &lst,PyObject *pValue);

      static void lib_setup();
--- 29,41 ----
  {
  public:
!     pybase();
!     virtual ~pybase();

      void Exit();

!     static PyObject *MakePyArgs(const t_symbol *s,int argc,const t_atom *argv,int inlet = -1);
!     static PyObject *MakePyArg(const t_symbol *s,int argc,const t_atom *argv);
!     static const t_symbol *GetPyArgs(AtomList &lst,PyObject *pValue,int offs = 0);
!     static const t_symbol *GetPyAtom(AtomList &lst,PyObject *pValue);

      static void lib_setup();
***************
*** 44,48 ****

      void m__dir(PyObject *obj);
! 	void m__doc(PyObject *obj);

      void m_dir() { m__dir(module); }
--- 46,50 ----

      void m__dir(PyObject *obj);
!     void m__doc(PyObject *obj);

      void m_dir() { m__dir(module); }
***************
*** 51,64 ****

      std::string modname; // module name
! 	PyObject *module,*dict; // object module and associated dictionary

! 	static const char *py_doc;

      void GetDir(PyObject *obj,AtomList &lst);

! 	AtomList args;

      void AddCurrentPath(flext_base *o);
! 	void SetArgs();

      bool OutObject(flext_base *ext,int o,PyObject *obj);
--- 53,66 ----

      std::string modname; // module name
!     PyObject *module,*dict; // object module and associated dictionary

!     static const char *py_doc;

      void GetDir(PyObject *obj,AtomList &lst);

!     AtomList args;

      void AddCurrentPath(flext_base *o);
!     void SetArgs();

      bool OutObject(flext_base *ext,int o,PyObject *obj);
***************
*** 67,89 ****
      void Reload();

! 	bool ImportModule(const char *name);
! 	void UnimportModule();
! 	bool ReloadModule();

      // Get module registry
! 	PyObject *GetRegistry(const char *regname);
      // Set module registry
! 	void SetRegistry(const char *regname,PyObject *reg);

      // Register object
! 	void Register(PyObject *reg);
      // Unregister object
! 	void Unregister(PyObject *reg);

! 	virtual void LoadModule() = 0;
! 	virtual void UnloadModule() = 0;

! 	virtual void Load() = 0;
! 	virtual void Unload() = 0;

      void OpenEditor();
--- 69,91 ----
      void Reload();

!     bool ImportModule(const char *name);
!     void UnimportModule();
!     bool ReloadModule();

      // Get module registry
!     PyObject *GetRegistry(const char *regname);
      // Set module registry
!     void SetRegistry(const char *regname,PyObject *reg);

      // Register object
!     void Register(PyObject *reg);
      // Unregister object
!     void Unregister(PyObject *reg);

!     virtual void LoadModule() = 0;
!     virtual void UnloadModule() = 0;

!     virtual void Load() = 0;
!     virtual void Unload() = 0;

      void OpenEditor();
***************
*** 100,130 ****
      void Report() { while(PyErr_Occurred()) PyErr_Print(); }

! 	static bool IsAnything(const t_symbol *s) { return s && s != sym_float && s != sym_int && s != sym_symbol && s != sym_list && s != sym_pointer; }
! 	static bool IsAtom(const t_symbol *s) { return s == sym_float || s == sym_int || s == sym_symbol || s == sym_pointer; }

! //	enum retval { nothing,atom,sequ };

! 	// --- module stuff -----

! 	static PyObject *module_obj,*module_dict;
! 	static PyObject *builtins_obj,*builtins_dict;
! 	static PyMethodDef func_tbl[],attr_tbl[];

! 	static PyObject *py__doc__(PyObject *,PyObject *args);
! 	static PyObject *py_send(PyObject *,PyObject *args);
  #ifdef FLEXT_THREADS
! 	static PyObject *py_priority(PyObject *,PyObject *args);
  #endif

! 	static PyObject *py_arraysupport(PyObject *,PyObject *args);
! 	static PyObject *py_samplerate(PyObject *,PyObject *args);
! 	static PyObject *py_blocksize(PyObject *,PyObject *args);

! 	static PyObject *py_searchpaths(PyObject *,PyObject *args);
! 	static PyObject *py_helppaths(PyObject *,PyObject *args);

  #if FLEXT_SYS == FLEXT_SYS_PD
! 	static PyObject *py_getvalue(PyObject *,PyObject *args);
! 	static PyObject *py_setvalue(PyObject *,PyObject *args);
  #endif

--- 102,132 ----
      void Report() { while(PyErr_Occurred()) PyErr_Print(); }

!     static bool IsAnything(const t_symbol *s) { return s && s != sym_float && s != sym_int && s != sym_symbol && s != sym_list && s != sym_pointer; }
!     static bool IsAtom(const t_symbol *s) { return s == sym_float || s == sym_int || s == sym_symbol || s == sym_pointer; }

! //  enum retval { nothing,atom,sequ };

!     // --- module stuff -----

!     static PyObject *module_obj,*module_dict;
!     static PyObject *builtins_obj,*builtins_dict;
!     static PyMethodDef func_tbl[],attr_tbl[];

!     static PyObject *py__doc__(PyObject *,PyObject *args);
!     static PyObject *py_send(PyObject *,PyObject *args);
  #ifdef FLEXT_THREADS
!     static PyObject *py_priority(PyObject *,PyObject *args);
  #endif

!     static PyObject *py_arraysupport(PyObject *,PyObject *args);
!     static PyObject *py_samplerate(PyObject *,PyObject *args);
!     static PyObject *py_blocksize(PyObject *,PyObject *args);

!     static PyObject *py_searchpaths(PyObject *,PyObject *args);
!     static PyObject *py_helppaths(PyObject *,PyObject *args);

  #if FLEXT_SYS == FLEXT_SYS_PD
!     static PyObject *py_getvalue(PyObject *,PyObject *args);
!     static PyObject *py_setvalue(PyObject *,PyObject *args);
  #endif

***************
*** 132,147 ****
      static PyObject *py_tuple(PyObject *,PyObject *args);

! 	// ----thread stuff ------------

! 	virtual void m_stop(int argc,const t_atom *argv);

! 	bool respond;
  #ifdef FLEXT_THREADS
! 	int thrcount;
      bool shouldexit;
! 	int stoptick;
      Timer stoptmr;

! 	void tick(void *);
  #endif

--- 134,149 ----
      static PyObject *py_tuple(PyObject *,PyObject *args);

!     // ----thread stuff ------------

!     virtual void m_stop(int argc,const t_atom *argv);

!     bool respond;
  #ifdef FLEXT_THREADS
!     int thrcount;
      bool shouldexit;
!     int stoptick;
      Timer stoptmr;

!     void tick(void *);
  #endif

***************
*** 188,192 ****
      static PyFifo qufifo;
      static ThrCond qucond;
! 	
  #ifndef PY_USE_GIL
      static ThrState pythrsys;
--- 190,194 ----
      static PyFifo qufifo;
      static ThrCond qucond;
!     
  #ifndef PY_USE_GIL
      static ThrState pythrsys;
***************
*** 202,206 ****
  public:

! 	static void AddToPath(const char *dir);

  #ifdef FLEXT_THREADS
--- 204,208 ----
  public:

!     static void AddToPath(const char *dir);

  #ifdef FLEXT_THREADS
***************
*** 213,240 ****
      static inline ThrState FindThreadState() { return ThrState(); }

! 	static inline ThrState PyLock(ThrState = ThrState()) { return PyGILState_Ensure(); }
! 	static inline ThrState PyLockSys() { return PyLock(); }
! 	static inline void PyUnlock(ThrState st) { PyGILState_Release(st); }
  #else // PY_USE_GIL
      static ThrState FindThreadState();
      static void FreeThreadState();

! 	static ThrState PyLock(ThrState st = FindThreadState()) 
      { 
!         if(!IsSystemThread() || !lockcount++) PyEval_AcquireLock();
! 	    return PyThreadState_Swap(st);
      }

  #if 1
! 	static inline ThrState PyLockSys() { return PyLock(); }
  #else
! 	static ThrState PyLockSys() 
      { 
          if(!lockcount++) PyEval_AcquireLock();
! 	    return PyThreadState_Swap(pythrsys);
      }
  #endif

! 	static void PyUnlock(ThrState st) 
      {
          ThrState old = PyThreadState_Swap(st);
--- 215,242 ----
      static inline ThrState FindThreadState() { return ThrState(); }

!     static inline ThrState PyLock(ThrState = ThrState()) { return PyGILState_Ensure(); }
!     static inline ThrState PyLockSys() { return PyLock(); }
!     static inline void PyUnlock(ThrState st) { PyGILState_Release(st); }
  #else // PY_USE_GIL
      static ThrState FindThreadState();
      static void FreeThreadState();

!     static ThrState PyLock(ThrState st = FindThreadState()) 
      { 
!         if(st != pythrsys || !lockcount++) PyEval_AcquireLock();
!         return PyThreadState_Swap(st);
      }

  #if 1
!     static inline ThrState PyLockSys() { return PyLock(); }
  #else
!     static ThrState PyLockSys() 
      { 
          if(!lockcount++) PyEval_AcquireLock();
!         return PyThreadState_Swap(pythrsys);
      }
  #endif

!     static void PyUnlock(ThrState st) 
      {
          ThrState old = PyThreadState_Swap(st);
***************
*** 242,253 ****
      }
  #endif // PY_USE_GIL
! 	
  #else // FLEXT_THREADS
! 	static inline ThrState PyLock(ThrState = NULL) { return NULL; }
! 	static inline ThrState PyLockSys() { return NULL; }
! 	static inline void PyUnlock(ThrState st) {}
  #endif

! 	static PyObject* StdOut_Write(PyObject* Self, PyObject* Args);
  };

--- 244,255 ----
      }
  #endif // PY_USE_GIL
!     
  #else // FLEXT_THREADS
!     static inline ThrState PyLock(ThrState = NULL) { return NULL; }
!     static inline ThrState PyLockSys() { return NULL; }
!     static inline void PyUnlock(ThrState st) {}
  #endif

!     static PyObject* StdOut_Write(PyObject* Self, PyObject* Args);
  };

Index: pybase.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pybase.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** pybase.cpp	6 Jul 2007 21:44:56 -0000	1.19
--- pybase.cpp	3 Jan 2008 16:21:04 -0000	1.20
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python external object for PD and MaxMSP

! Copyright (c)2002-2007 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python external object for PD and MaxMSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

***************
*** 106,110 ****
  	post("------------------------------------------------");
  	post("py/pyext %s - python script objects",PY__VERSION);
! 	post("(C)2002-2007 Thomas Grill - http://grrrr.org/ext");
      post("");
      post("using Python %s",Py_GetVersion());
--- 108,112 ----
  	post("------------------------------------------------");
  	post("py/pyext %s - python script objects",PY__VERSION);
! 	post("(C)2002-2008 Thomas Grill - http://grrrr.org/ext");
      post("");
      post("using Python %s",Py_GetVersion());
***************
*** 200,204 ****

  	// -------------------------------------------------------------
! #ifdef PY_USE_INOFFICIAL
      // add PD paths

--- 202,206 ----

  	// -------------------------------------------------------------
! #if FLEXT_SYS == FLEXT_SYS_PD && defined(PD_DEVEL_VERSION) && defined(PY_USE_INOFFICIAL)
      // add PD paths

Index: py.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/py.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** py.cpp	6 Jul 2007 21:44:56 -0000	1.37
--- py.cpp	3 Jan 2008 16:21:04 -0000	1.38
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2007 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

***************
*** 242,246 ****
  {
  	post("");
! 	post("%s %s - python script object, (C)2002-2007 Thomas Grill",thisName(),PY__VERSION);
  #ifdef FLEXT_DEBUG
  	post("DEBUG VERSION, compiled on " __DATE__ " " __TIME__);
--- 244,248 ----
  {
  	post("");
! 	post("%s %s - python script object, (C)2002-2008 Thomas Grill",thisName(),PY__VERSION);
  #ifdef FLEXT_DEBUG
  	post("DEBUG VERSION, compiled on " __DATE__ " " __TIME__);

Index: pysymbol.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pysymbol.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** pysymbol.cpp	27 Mar 2007 17:16:17 -0000	1.8
--- pysymbol.cpp	3 Jan 2008 16:21:04 -0000	1.9
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2007 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

Index: pydsp.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pydsp.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pydsp.cpp	7 Mar 2007 13:40:14 -0000	1.7
--- pydsp.cpp	3 Jan 2008 16:21:04 -0000	1.8
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2005 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

Index: pysymbol.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pysymbol.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pysymbol.h	7 Mar 2007 13:40:14 -0000	1.5
--- pysymbol.h	3 Jan 2008 16:21:04 -0000	1.6
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2005 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

Index: bound.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/bound.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** bound.cpp	7 Mar 2007 13:40:14 -0000	1.19
--- bound.cpp	3 Jan 2008 16:21:03 -0000	1.20
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python external object for PD and MaxMSP

! Copyright (c)2002-2005 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python external object for PD and MaxMSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

Index: modmeth.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/modmeth.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** modmeth.cpp	6 Jul 2007 21:44:56 -0000	1.25
--- modmeth.cpp	3 Jan 2008 16:21:04 -0000	1.26
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python external object for PD and Max/MSP

! Copyright (c)2002-2007 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python external object for PD and Max/MSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

***************
*** 39,43 ****

  const char *pybase::py_doc =
! 	"py/pyext - python external object for PD and Max/MSP, (C)2002-2007 Thomas Grill\n"
  	"\n"
  	"This is the pyext module. Available function:\n"
--- 41,45 ----

  const char *pybase::py_doc =
! 	"py/pyext - python external object for PD and Max/MSP, (C)2002-2008 Thomas Grill\n"
  	"\n"
  	"This is the pyext module. Available function:\n"
***************
*** 116,120 ****
  PyObject *pybase::py_searchpaths(PyObject *self,PyObject *args)
  {
! #if FLEXT_SYS == FLEXT_SYS_PD && defined(PY_USE_INOFFICIAL)
      PyObject *ret = PyList_New(0);
      char *dir;
--- 118,122 ----
  PyObject *pybase::py_searchpaths(PyObject *self,PyObject *args)
  {
! #if FLEXT_SYS == FLEXT_SYS_PD && defined(PD_DEVEL_VERSION) && defined(PY_USE_INOFFICIAL)
      PyObject *ret = PyList_New(0);
      char *dir;
***************
*** 130,134 ****
  PyObject *pybase::py_helppaths(PyObject *self,PyObject *args)
  {
! #if FLEXT_SYS == FLEXT_SYS_PD && defined(PY_USE_INOFFICIAL)
      PyObject *ret = PyList_New(0);
      char *dir;
--- 132,136 ----
  PyObject *pybase::py_helppaths(PyObject *self,PyObject *args)
  {
! #if FLEXT_SYS == FLEXT_SYS_PD && defined(PD_DEVEL_VERSION) && defined(PY_USE_INOFFICIAL)
      PyObject *ret = PyList_New(0);
      char *dir;

Index: register.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/register.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** register.cpp	8 Jul 2005 14:30:31 -0000	1.8
--- register.cpp	3 Jan 2008 16:21:04 -0000	1.9
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python external object for PD and MaxMSP

! Copyright (c)2002-2005 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python external object for PD and MaxMSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

Index: pybuffer.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pybuffer.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** pybuffer.cpp	6 Jul 2007 21:44:56 -0000	1.13
--- pybuffer.cpp	3 Jan 2008 16:21:04 -0000	1.14
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2007 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

Index: pymeth.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pymeth.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pymeth.cpp	7 Mar 2007 13:40:14 -0000	1.7
--- pymeth.cpp	3 Jan 2008 16:21:04 -0000	1.8
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2005 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

***************
*** 283,287 ****
  {
  	post("");
! 	post("%s %s - python method object, (C)2002-2005 Thomas Grill",thisName(),PY__VERSION);
  #ifdef FLEXT_DEBUG
  	post("DEBUG VERSION, compiled on " __DATE__ " " __TIME__);
--- 285,289 ----
  {
  	post("");
! 	post("%s %s - python method object, (C)2002-2008 Thomas Grill",thisName(),PY__VERSION);
  #ifdef FLEXT_DEBUG
  	post("DEBUG VERSION, compiled on " __DATE__ " " __TIME__);

Index: main.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/main.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** main.h	1 Nov 2007 21:44:22 -0000	1.45
--- main.h	3 Jan 2008 16:21:04 -0000	1.46
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python script object for PD and MaxMSP

! Copyright (c)2002-2005 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python script object for PD and MaxMSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

***************
*** 29,33 ****

  class FifoEl
!     : public Fifo::Cell
  {
  public:
--- 31,35 ----

  class FifoEl
!     : public FifoCell
  {
  public:

Index: clmeth.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/clmeth.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** clmeth.cpp	7 Mar 2007 13:40:14 -0000	1.28
--- clmeth.cpp	3 Jan 2008 16:21:03 -0000	1.29
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python external object for PD and Max/MSP

! Copyright (c)2002-2007 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python external object for PD and Max/MSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

***************
*** 44,48 ****

  const char *pyext::pyext_doc =
! 	"py/pyext - python external object for PD and Max/MSP, (C)2002-2007 Thomas Grill\n"
  	"\n"
  	"This is the pyext base class. Available methods:\n"
--- 46,50 ----

  const char *pyext::pyext_doc =
! 	"py/pyext - python external object for PD and Max/MSP, (C)2002-2008 Thomas Grill\n"
  	"\n"
  	"This is the pyext base class. Available methods:\n"

Index: pyext.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** pyext.h	6 Jul 2007 21:44:56 -0000	1.32
--- pyext.h	3 Jan 2008 16:21:04 -0000	1.33
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python external object for PD and MaxMSP

! Copyright (c)2002-2005 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python external object for PD and MaxMSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

Index: pyext.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** pyext.cpp	6 Jul 2007 21:44:56 -0000	1.48
--- pyext.cpp	3 Jan 2008 16:21:04 -0000	1.49
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2005 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

***************
*** 511,515 ****
  {
  	post("");
! 	post("%s %s - python class object, (C)2002-2005 Thomas Grill",thisName(),PY__VERSION);
  #ifdef FLEXT_DEBUG
  	post("DEBUG VERSION, compiled on " __DATE__ " " __TIME__);
--- 513,517 ----
  {
  	post("");
! 	post("%s %s - python class object, (C)2002-2008 Thomas Grill",thisName(),PY__VERSION);
  #ifdef FLEXT_DEBUG
  	post("DEBUG VERSION, compiled on " __DATE__ " " __TIME__);

Index: pyatom.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pyatom.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pyatom.cpp	7 Mar 2007 13:40:14 -0000	1.2
--- pyatom.cpp	3 Jan 2008 16:21:04 -0000	1.3
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2005 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

Index: pybuffer.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pybuffer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pybuffer.h	26 Sep 2005 13:59:59 -0000	1.2
--- pybuffer.h	3 Jan 2008 16:21:04 -0000	1.3
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2005 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

Index: pybundle.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pybundle.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pybundle.cpp	7 Mar 2007 13:40:14 -0000	1.2
--- pybundle.cpp	3 Jan 2008 16:21:04 -0000	1.3
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2005 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */

Index: pybundle.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pybundle.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pybundle.h	7 Mar 2007 13:40:14 -0000	1.2
--- pybundle.h	3 Jan 2008 16:21:04 -0000	1.3
***************
*** 1,10 ****
  /* 
- 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2005 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

  */

--- 1,12 ----
  /* 
  py/pyext - python script object for PD and Max/MSP

! Copyright (c)2002-2008 Thomas Grill (gr at grrrr.org)
  For information on usage and redistribution, and for a DISCLAIMER OF ALL
  WARRANTIES, see the file, "license.txt," in this distribution.  

+ $LastChangedRevision: 26 $
+ $LastChangedDate: 2008-01-03 17:20:03 +0100 (Thu, 03 Jan 2008) $
+ $LastChangedBy: thomas $
  */