[Python-checkins] CVS: python/dist/src/Python errors.c,2.57,2.57.2.1

[Moshe Zadka]

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

Modified Files:
      Tag: release20-maint
	errors.c 
Log Message:
Use Py_CHARMASK for ctype macros. Fixes bug #232787.


Index: errors.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/errors.c,v
retrieving revision 2.57
retrieving revision 2.57.2.1
diff -C2 -r2.57 -r2.57.2.1
*** errors.c	2000/10/10 21:10:35	2.57
--- errors.c	2001/03/31 07:33:56	2.57.2.1
***************
*** 403,407 ****
  		if (*f == '%') {
  			const char* p = f;
! 			while (*++f && *f != '%' && !isalpha(*f))
  				;
  			switch (*f) {
--- 403,407 ----
  		if (*f == '%') {
  			const char* p = f;
! 			while (*++f && *f != '%' && !isalpha(Py_CHARMASK(*f)))
  				;
  			switch (*f) {
***************
*** 458,470 ****
  			   interested in the precision value, if any) */
  			n = 0;
! 			while (isdigit(*f))
  				n = (n*10) + *f++ - '0';
  			if (*f == '.') {
  				f++;
  				n = 0;
! 				while (isdigit(*f))
  					n = (n*10) + *f++ - '0';
  			}
! 			while (*f && *f != '%' && !isalpha(*f))
  				f++;
  			switch (*f) {
--- 458,470 ----
  			   interested in the precision value, if any) */
  			n = 0;
! 			while (isdigit(Py_CHARMASK(*f)))
  				n = (n*10) + *f++ - '0';
  			if (*f == '.') {
  				f++;
  				n = 0;
! 				while (isdigit(Py_CHARMASK(*f)))
  					n = (n*10) + *f++ - '0';
  			}
! 			while (*f && *f != '%' && !isalpha(Py_CHARMASK(*f)))
  				f++;
  			switch (*f) {