[Python-checkins] python/dist/src/Doc/ext noddy.c,1.4,1.5

[dcjim@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Doc/ext
In directory sc8-pr-cvs1:/tmp/cvs-serv27702

Modified Files:
	noddy.c 
Log Message:
Updated simple example. This should have been checked in the other
day, but I missfired in CVS.


Index: noddy.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/ext/noddy.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** noddy.c	31 Jul 2002 06:17:46 -0000	1.4
--- noddy.c	12 May 2003 17:42:56 -0000	1.5
***************
*** 1,6 ****
  #include <Python.h>
  
- static PyTypeObject noddy_NoddyType;
- 
  typedef struct {
      PyObject_HEAD
--- 1,4 ----
***************
*** 8,55 ****
  } noddy_NoddyObject;
  
- static PyObject*
- noddy_new_noddy(PyObject* self, PyObject* args)
- {
-     noddy_NoddyObject* noddy;
- 
-     noddy = PyObject_New(noddy_NoddyObject, &noddy_NoddyType);
- 
-     /* Initialize type-specific fields here. */
- 
-     return (PyObject*)noddy;
- }
- 
- static void
- noddy_noddy_dealloc(PyObject* self)
- {
-     /* Free any external resources here;
-      * if the instance owns references to any Python
-      * objects, call Py_DECREF() on them here.
-      */
-     PyObject_Del(self);
- }
- 
  static PyTypeObject noddy_NoddyType = {
      PyObject_HEAD_INIT(NULL)
!     0,
!     "Noddy",
!     sizeof(noddy_NoddyObject),
!     0,
!     noddy_noddy_dealloc, /*tp_dealloc*/
!     0,          /*tp_print*/
!     0,          /*tp_getattr*/
!     0,          /*tp_setattr*/
!     0,          /*tp_compare*/
!     0,          /*tp_repr*/
!     0,          /*tp_as_number*/
!     0,          /*tp_as_sequence*/
!     0,          /*tp_as_mapping*/
!     0,          /*tp_hash */
  };
  
  static PyMethodDef noddy_methods[] = {
-     {"new_noddy", noddy_new_noddy, METH_NOARGS,
-      "Create a new Noddy object."},
- 
      {NULL}  /* Sentinel */
  };
--- 6,52 ----
  } noddy_NoddyObject;
  
  static PyTypeObject noddy_NoddyType = {
      PyObject_HEAD_INIT(NULL)
!     0,                         /*ob_size*/
!     "noddy.Noddy",             /*tp_name*/
!     sizeof(noddy_NoddyObject), /*tp_basicsize*/
!     0,                         /*tp_itemsize*/
!     0,                         /*tp_dealloc*/
!     0,                         /*tp_print*/
!     0,                         /*tp_getattr*/
!     0,                         /*tp_setattr*/
!     0,                         /*tp_compare*/
!     0,                         /*tp_repr*/
!     0,                         /*tp_as_number*/
!     0,                         /*tp_as_sequence*/
!     0,                         /*tp_as_mapping*/
!     0,                         /*tp_hash */
!     0,                         /*tp_call*/
!     0,                         /*tp_str*/
!     0,                         /*tp_getattro*/
!     0,                         /*tp_setattro*/
!     0,                         /*tp_as_buffer*/
!     Py_TPFLAGS_DEFAULT,        /*tp_flags*/
!     "Noddy objects",           /* tp_doc */
!     0,		               /* tp_traverse */
!     0,		               /* tp_clear */
!     0,		               /* tp_richcompare */
!     0,		               /* tp_weaklistoffset */
!     0,		               /* tp_iter */
!     0,		               /* tp_iternext */
!     0,		               /* tp_methods */
!     0,                         /* tp_members */
!     0,                         /* tp_getset */
!     0,                         /* tp_base */
!     0,                         /* tp_dict */
!     0,                         /* tp_descr_get */
!     0,                         /* tp_descr_set */
!     0,                         /* tp_dictoffset */
!     0,                         /* tp_init */
!     0,                         /* tp_alloc */
!     PyType_GenericNew,         /* tp_new */
  };
  
  static PyMethodDef noddy_methods[] = {
      {NULL}  /* Sentinel */
  };
***************
*** 58,66 ****
  initnoddy(void) 
  {
!     noddy_NoddyType.ob_type = &PyType_Type;
!     if (PyType_Ready(&noddy_NoddyType))
          return;
  
!     Py_InitModule3("noddy", noddy_methods
!                    "Example module that creates an extension type.");
  }
--- 55,66 ----
  initnoddy(void) 
  {
!     PyObject* m;
! 
!     if (PyType_Ready(&noddy_NoddyType) < 0)
          return;
  
!     m = Py_InitModule3("noddy", noddy_methods,
!                        "Example module that creates an extension type.");
! 
!     PyModule_AddObject(m, "Noddy", (PyObject *)&noddy_NoddyType);
  }