[Python-checkins] CVS: python/dist/src/Lib locale.py,1.17,1.18

[Guido van Rossum]

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

Modified Files:
	locale.py 
Log Message:
Implement Mark Favas's suggestion.  There's a clear bug in _group():
its first return statement returns a single value while its caller
always expects it to return a tuple of two items.  Fix this by
returning (s, 0) instead.

This won't make the locale test on Irix succeed, but now it will fail
because of a bug in the platform's en_US locale rather than because of
a bug in the locale module.


Index: locale.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/locale.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** locale.py	2001/04/13 08:09:50	1.17
--- locale.py	2001/04/16 16:04:10	1.18
***************
*** 94,98 ****
      conv=localeconv()
      grouping=conv['grouping']
!     if not grouping:return s
      result=""
      seps = 0
--- 94,98 ----
      conv=localeconv()
      grouping=conv['grouping']
!     if not grouping:return (s, 0)
      result=""
      seps = 0