Issue #2173: fix build failure on OS X. device_encoding was returning an

mdickinson · mdickinson · commit da2706b28f31 · 2008-12-11T18:03:03.000Z
empty string, causing an (invisible) LookupError on any attempt to write
to sys.stdout.
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -12,6 +12,10 @@ What's New in Python 3.1 alpha 0
 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.
 
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -6724,7 +6724,7 @@ device_encoding(PyObject *self, PyObject *args)
 #elif defined(CODESET)
 	{
 		char *codeset = nl_langinfo(CODESET);
-		if (codeset)
+		if (codeset != NULL && codeset[0] != 0)
 			return PyUnicode_FromString(codeset);
 	}
 #endif

Original file line number	Diff line number	Diff line change
`@@ -6724,7 +6724,7 @@ device_encoding(PyObject self, PyObject args)`
`6724`	`6724`	`#elif defined(CODESET)`
`6725`	`6725`	`{`
`6726`	`6726`	`char *codeset = nl_langinfo(CODESET);`
`6727`		`- if (codeset)`
	`6727`	`+ if (codeset != NULL && codeset[0] != 0)`
`6728`	`6728`	`return PyUnicode_FromString(codeset);`
`6729`	`6729`	`}`
`6730`	`6730`	`#endif`