[Python-checkins]
python/dist/src/Lib/idlelib IOBinding.py, 1.19.8.3, 1.19.8.4
loewis at users.sourceforge.net
loewis at users.sourceforge.net
Thu Aug 12 15:14:24 CEST 2004
Update of /cvsroot/python/python/dist/src/Lib/idlelib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11209
Modified Files:
Tag: release23-maint
IOBinding.py
Log Message:
Ignore the locale's encoding if it is an empty string.
Index: IOBinding.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/IOBinding.py,v
retrieving revision 1.19.8.3
retrieving revision 1.19.8.4
diff -C2 -d -r1.19.8.3 -r1.19.8.4
*** IOBinding.py 25 Nov 2003 05:06:56 -0000 1.19.8.3
--- IOBinding.py 12 Aug 2004 13:14:20 -0000 1.19.8.4
***************
*** 49,53 ****
# these problems, falling back to ASCII
encoding = locale.nl_langinfo(locale.CODESET)
! if encoding is None:
# situation occurs on Mac OS X
encoding = 'ascii'
--- 49,53 ----
# these problems, falling back to ASCII
encoding = locale.nl_langinfo(locale.CODESET)
! if encoding is None or encoding is '':
# situation occurs on Mac OS X
encoding = 'ascii'
***************
*** 59,63 ****
try:
encoding = locale.getdefaultlocale()[1]
! if encoding is None:
# situation occurs on Mac OS X
encoding = 'ascii'
--- 59,63 ----
try:
encoding = locale.getdefaultlocale()[1]
! if encoding is None or encoding is '':
# situation occurs on Mac OS X
encoding = 'ascii'
More information about the Python-checkins
mailing list