[Python-checkins] CVS: python/dist/src/Objects intobject.c,2.37,2.38

Guido van Rossum guido@cnri.reston.va.us
Tue, 15 Feb 2000 09:51:48 -0500 (EST)


Update of /projects/cvsroot/python/dist/src/Objects
In directory eric:/projects/python/develop/guido/src/Objects

Modified Files:
	intobject.c 
Log Message:
In response to one particular complaint on edu-sig, change some error
messages from "OverflowError: integer pow()" to "OverflowError:
integer exponentiation".  (Not that this takes care of the complaint
in general that the error messages could be greatly improved. :-)


Index: intobject.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/intobject.c,v
retrieving revision 2.37
retrieving revision 2.38
diff -C2 -r2.37 -r2.38
*** intobject.c	2000/01/20 22:32:54	2.37
--- intobject.c	2000/02/15 14:51:46	2.38
***************
*** 578,582 ****
  				break; /* Avoid ix / 0 */
  			if (ix / temp != prev)
! 				return err_ovf("integer pow()");
  		}
  	 	iw >>= 1;	/* Shift exponent down by 1 bit */
--- 578,582 ----
  				break; /* Avoid ix / 0 */
  			if (ix / temp != prev)
! 				return err_ovf("integer exponentiation");
  		}
  	 	iw >>= 1;	/* Shift exponent down by 1 bit */
***************
*** 585,589 ****
  	 	temp *= temp;	/* Square the value of temp */
  	 	if (prev!=0 && temp/prev!=prev)
! 			return err_ovf("integer pow()");
  	 	if (iz) {
  			/* If we did a multiplication, perform a modulo */
--- 585,589 ----
  	 	temp *= temp;	/* Square the value of temp */
  	 	if (prev!=0 && temp/prev!=prev)
! 			return err_ovf("integer exponentiation");
  	 	if (iz) {
  			/* If we did a multiplication, perform a modulo */
***************
*** 631,635 ****
  			break; /* 0 to some power -- avoid ix / 0 */
  		if (ix / iv != prev)
! 			return err_ovf("integer pow()");
  	}
  	return PyInt_FromLong(ix);
--- 631,635 ----
  			break; /* 0 to some power -- avoid ix / 0 */
  		if (ix / iv != prev)
! 			return err_ovf("integer exponentiation");
  	}
  	return PyInt_FromLong(ix);