Index: Python/bltinmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/bltinmodule.c,v
retrieving revision 2.308
diff -c -r2.308 bltinmodule.c
*** Python/bltinmodule.c	2 Feb 2004 13:39:01 -0000	2.308
--- Python/bltinmodule.c	4 Feb 2004 15:00:07 -0000
***************
*** 1481,1499 ****
  	PyObject *v;
  
  	if (PyTuple_Size(args) <= 1) {
! 		if (!PyArg_ParseTuple(args,
! 				"l;range() requires 1-3 int arguments",
! 				&ihigh)) {
! 			PyErr_Clear();
! 			return handle_range_longs(self, args);
  		}
  	}
  	else {
! 		if (!PyArg_ParseTuple(args,
! 				"ll|l;range() requires 1-3 int arguments",
! 				&ilow, &ihigh, &istep)) {
! 			PyErr_Clear();
! 			return handle_range_longs(self, args);
  		}
  	}
  	if (istep == 0) {
--- 1481,1510 ----
  	PyObject *v;
  
  	if (PyTuple_Size(args) <= 1) {
! 		if (!PyArg_ParseTuple(args, "l", &ihigh)) {
! 			if (PyTuple_Size(args) == 1 
! 			    && PyLong_Check(PyTuple_GET_ITEM(args, 0))) {
! 				PyErr_Clear();
! 				return handle_range_longs(self, args);
! 			}
! 			else {
! 				return NULL;
! 			}
  		}
  	}
  	else {
! 		if (!PyArg_ParseTuple(args, "ll|l",
! 				      &ilow, &ihigh, &istep)) {
! 			if (PyLong_Check(PyTuple_GET_ITEM(args, 0))
! 			    || PyLong_Check(PyTuple_GET_ITEM(args, 1))
! 			    || (PyTuple_Size(args) == 3 
! 				&& PyLong_Check(PyTuple_GET_ITEM(args, 2)))) {
! 				PyErr_Clear();
! 				return handle_range_longs(self, args);
! 			}
! 			else {
! 				return NULL;
! 			}
  		}
  	}
  	if (istep == 0) {
Index: Python/getargs.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/getargs.c,v
retrieving revision 2.100
diff -c -r2.100 getargs.c
*** Python/getargs.c	3 May 2003 10:00:22 -0000	2.100
--- Python/getargs.c	4 Feb 2004 15:00:07 -0000
***************
*** 469,475 ****
  		char *p = va_arg(*p_va, char *);
  		long ival;
  		if (float_argument_error(arg))
! 			return NULL;
  		ival = PyInt_AsLong(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<b>", arg, msgbuf, bufsize);
--- 469,475 ----
  		char *p = va_arg(*p_va, char *);
  		long ival;
  		if (float_argument_error(arg))
! 			return "";
  		ival = PyInt_AsLong(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<b>", arg, msgbuf, bufsize);
***************
*** 493,499 ****
  		char *p = va_arg(*p_va, char *);
  		long ival;
  		if (float_argument_error(arg))
! 			return NULL;
  		ival = PyInt_AsUnsignedLongMask(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<B>", arg, msgbuf, bufsize);
--- 493,499 ----
  		char *p = va_arg(*p_va, char *);
  		long ival;
  		if (float_argument_error(arg))
! 			return "";
  		ival = PyInt_AsUnsignedLongMask(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<B>", arg, msgbuf, bufsize);
***************
*** 506,512 ****
  		short *p = va_arg(*p_va, short *);
  		long ival;
  		if (float_argument_error(arg))
! 			return NULL;
  		ival = PyInt_AsLong(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<h>", arg, msgbuf, bufsize);
--- 506,512 ----
  		short *p = va_arg(*p_va, short *);
  		long ival;
  		if (float_argument_error(arg))
! 			return "";
  		ival = PyInt_AsLong(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<h>", arg, msgbuf, bufsize);
***************
*** 530,536 ****
  		unsigned short *p = va_arg(*p_va, unsigned short *);
  		long ival;
  		if (float_argument_error(arg))
! 			return NULL;
  		ival = PyInt_AsUnsignedLongMask(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<H>", arg, msgbuf, bufsize);
--- 530,536 ----
  		unsigned short *p = va_arg(*p_va, unsigned short *);
  		long ival;
  		if (float_argument_error(arg))
! 			return "";
  		ival = PyInt_AsUnsignedLongMask(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<H>", arg, msgbuf, bufsize);
***************
*** 543,549 ****
  		int *p = va_arg(*p_va, int *);
  		long ival;
  		if (float_argument_error(arg))
! 			return NULL;
  		ival = PyInt_AsLong(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<i>", arg, msgbuf, bufsize);
--- 543,549 ----
  		int *p = va_arg(*p_va, int *);
  		long ival;
  		if (float_argument_error(arg))
! 			return "";
  		ival = PyInt_AsLong(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<i>", arg, msgbuf, bufsize);
***************
*** 567,573 ****
  		unsigned int *p = va_arg(*p_va, unsigned int *);
  		unsigned int ival;
  		if (float_argument_error(arg))
! 			return NULL;
  		ival = PyInt_AsUnsignedLongMask(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<I>", arg, msgbuf, bufsize);
--- 567,573 ----
  		unsigned int *p = va_arg(*p_va, unsigned int *);
  		unsigned int ival;
  		if (float_argument_error(arg))
! 			return "";
  		ival = PyInt_AsUnsignedLongMask(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<I>", arg, msgbuf, bufsize);
***************
*** 580,586 ****
  		long *p = va_arg(*p_va, long *);
  		long ival;
  		if (float_argument_error(arg))
! 			return NULL;
  		ival = PyInt_AsLong(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<l>", arg, msgbuf, bufsize);
--- 580,586 ----
  		long *p = va_arg(*p_va, long *);
  		long ival;
  		if (float_argument_error(arg))
! 			return "";
  		ival = PyInt_AsLong(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<l>", arg, msgbuf, bufsize);
***************
*** 618,624 ****
  		unsigned PY_LONG_LONG *p = va_arg(*p_va, unsigned PY_LONG_LONG *);
  		unsigned PY_LONG_LONG ival;
  		if (float_argument_error(arg))
! 			return NULL;
  		if (PyInt_Check(arg))
  			ival = PyInt_AsUnsignedLongMask(arg);
  		else if (PyLong_Check(arg))
--- 618,624 ----
  		unsigned PY_LONG_LONG *p = va_arg(*p_va, unsigned PY_LONG_LONG *);
  		unsigned PY_LONG_LONG ival;
  		if (float_argument_error(arg))
! 			return "";
  		if (PyInt_Check(arg))
  			ival = PyInt_AsUnsignedLongMask(arg);
  		else if (PyLong_Check(arg))