[Python-checkins] r67704 - in python/branches/release30-maint: Misc/NEWS Modules/posixmodule.c

Thu Dec 11 19:04:16 CET 2008

Author: mark.dickinson
Date: Thu Dec 11 19:04:15 2008
New Revision: 67704
Log:
Merged revisions 67703 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
 r67703 | mark.dickinson | 2008年12月11日 18:03:03 +0000 (2008年12月11日) | 4 lines
 
 Issue #2173: fix build failure on OS X. device_encoding was returning an
 empty string, causing an (invisible) LookupError on any attempt to write
 to sys.stdout.
........
Modified:
 python/branches/release30-maint/ (props changed)
 python/branches/release30-maint/Misc/NEWS
 python/branches/release30-maint/Modules/posixmodule.c
Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================

--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Thu Dec 11 19:04:15 2008
@@ -12,6 +12,10 @@
 Core and Builtins
 -----------------
 
+- Issue #2173: When getting device encoding, check that return value of
+ nl_langinfo is not the empty string. This was causing silent build
+ failures on OS X.
+
 - Issue #4597: Fixed several opcodes that weren't always propagating
 exceptions.
 
Modified: python/branches/release30-maint/Modules/posixmodule.c
==============================================================================
--- python/branches/release30-maint/Modules/posixmodule.c	(original)
+++ python/branches/release30-maint/Modules/posixmodule.c	Thu Dec 11 19:04:15 2008
@@ -6724,7 +6724,7 @@
 #elif defined(CODESET)
 	{
 		char *codeset = nl_langinfo(CODESET);
-		if (codeset)
+		if (codeset != NULL && codeset[0] != 0)
 			return PyUnicode_FromString(codeset);
 	}
 #endif
