[Python-checkins] CVS: python/dist/src/Include py_curses.h,1.3,1.4

[Martin v. L?wis]

Update of /cvsroot/python/python/dist/src/Include
In directory usw-pr-cvs1:/tmp/cvs-serv24782/Include

Modified Files:
	py_curses.h 
Log Message:
Patch #477752: Drop old-style getargs from curses.


Index: py_curses.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/py_curses.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** py_curses.h	2001/10/24 17:10:49	1.3
--- py_curses.h	2002/01/17 23:08:27	1.4
***************
*** 69,76 ****
  static char *catchall_NULL = "curses function returned NULL";
  
- /* Utility macros */
- #define ARG_COUNT(X) \
- 	(((X) == NULL) ? 0 : (PyTuple_Check(X) ? PyTuple_Size(X) : 1))
- 
  /* Function Prototype Macros - They are ugly but very, very useful. ;-)
  
--- 69,72 ----
***************
*** 82,89 ****
  
  #define NoArgNoReturnFunction(X) \
! static PyObject *PyCurses_ ## X (PyObject *self, PyObject *args) \
  { \
    PyCursesInitialised \
-   if (!PyArg_NoArgs(args)) return NULL; \
    return PyCursesCheckERR(X(), # X); }
  
--- 78,84 ----
  
  #define NoArgNoReturnFunction(X) \
! static PyObject *PyCurses_ ## X (PyObject *self) \
  { \
    PyCursesInitialised \
    return PyCursesCheckERR(X(), # X); }
  
***************
*** 93,101 ****
    int flag = 0; \
    PyCursesInitialised \
!   switch(ARG_COUNT(args)) { \
    case 0: \
      return PyCursesCheckERR(X(), # X); \
    case 1: \
!     if (!PyArg_Parse(args, "i;True(1) or False(0)", &flag)) return NULL; \
      if (flag) return PyCursesCheckERR(X(), # X); \
      else return PyCursesCheckERR(no ## X (), # X); \
--- 88,96 ----
    int flag = 0; \
    PyCursesInitialised \
!   switch(PyTuple_Size(args)) { \
    case 0: \
      return PyCursesCheckERR(X(), # X); \
    case 1: \
!     if (!PyArg_ParseTuple(args, "i;True(1) or False(0)", &flag)) return NULL; \
      if (flag) return PyCursesCheckERR(X(), # X); \
      else return PyCursesCheckERR(no ## X (), # X); \
***************
*** 105,127 ****
  
  #define NoArgReturnIntFunction(X) \
! static PyObject *PyCurses_ ## X (PyObject *self, PyObject *args) \
  { \
   PyCursesInitialised \
-  if (!PyArg_NoArgs(args)) return NULL; \
   return PyInt_FromLong((long) X()); }
  
  
  #define NoArgReturnStringFunction(X) \
! static PyObject *PyCurses_ ## X (PyObject *self, PyObject *args) \
  { \
    PyCursesInitialised \
-   if (!PyArg_NoArgs(args)) return NULL; \
    return PyString_FromString(X()); }
  
  #define NoArgTrueFalseFunction(X) \
! static PyObject *PyCurses_ ## X (PyObject *self, PyObject *args) \
  { \
    PyCursesInitialised \
-   if (!PyArg_NoArgs(args)) return NULL; \
    if (X () == FALSE) { \
      Py_INCREF(Py_False); \
--- 100,119 ----
  
  #define NoArgReturnIntFunction(X) \
! static PyObject *PyCurses_ ## X (PyObject *self) \
  { \
   PyCursesInitialised \
   return PyInt_FromLong((long) X()); }
  
  
  #define NoArgReturnStringFunction(X) \
! static PyObject *PyCurses_ ## X (PyObject *self) \
  { \
    PyCursesInitialised \
    return PyString_FromString(X()); }
  
  #define NoArgTrueFalseFunction(X) \
! static PyObject *PyCurses_ ## X (PyObject *self) \
  { \
    PyCursesInitialised \
    if (X () == FALSE) { \
      Py_INCREF(Py_False); \
***************
*** 132,139 ****
  
  #define NoArgNoReturnVoidFunction(X) \
! static PyObject *PyCurses_ ## X (PyObject *self, PyObject *args) \
  { \
    PyCursesInitialised \
-   if (!PyArg_NoArgs(args)) return NULL; \
    X(); \
    Py_INCREF(Py_None); \
--- 124,130 ----
  
  #define NoArgNoReturnVoidFunction(X) \
! static PyObject *PyCurses_ ## X (PyObject *self) \
  { \
    PyCursesInitialised \
    X(); \
    Py_INCREF(Py_None); \