Index: Modules/python.c
===================================================================
--- Modules/python.c	(revision 67444)
+++ Modules/python.c	(working copy)
@@ -38,7 +38,14 @@
 		return 1;
 	}
 	oldloc = setlocale(LC_ALL, NULL);
+	/* on OS X, assume that incoming arguments are always encoded
+	   in UTF8 */
+#ifdef __APPLE__
+	if(!setlocale(LC_ALL, "en_US.UTF-8"))
+		setlocale(LC_ALL, "");
+#else
 	setlocale(LC_ALL, "");
+#endif
 	for (i = 0; i < argc; i++) {
 #ifdef HAVE_BROKEN_MBSTOWCS
 		/* Some platforms have a broken implementation of