Index: Python/pythonrun.c
===================================================================
--- Python/pythonrun.c	(révision 80702)
+++ Python/pythonrun.c	(copie de travail)
@@ -57,6 +57,7 @@
 
 /* Forward */
 static void initmain(void);
+static void initfsencoding(void);
 static void initsite(void);
 static int initstdio(void);
 static void flush_io(void);
@@ -171,9 +172,6 @@
 	PyThreadState *tstate;
 	PyObject *bimod, *sysmod, *pstderr;
 	char *p;
-#if defined(HAVE_LANGINFO_H) && defined(CODESET)
-	char *codeset;
-#endif
 	extern void _Py_ReadyTypes(void);
 
 	if (initialized)
@@ -264,22 +262,8 @@
 
 	_PyImportHooks_Init();
 
-#if defined(HAVE_LANGINFO_H) && defined(CODESET)
-	/* On Unix, set the file system encoding according to the
-	   user's preference, if the CODESET names a well-known
-	   Python codec, and Py_FileSystemDefaultEncoding isn't
-	   initialized by other means. Also set the encoding of
-	   stdin and stdout if these are terminals.  */
+	initfsencoding();
 
-	codeset = get_codeset();
-	if (codeset) {
-		if (!Py_FileSystemDefaultEncoding)
-			Py_FileSystemDefaultEncoding = codeset;
-		else
-			free(codeset);
-	}
-#endif
-
 	if (install_sigs)
 		initsigs(); /* Signal handling stuff, including initintr() */
 		
@@ -707,6 +691,39 @@
 	}
 }
 
+static void
+initfsencoding(void)
+{
+	PyObject *codec;
+#if defined(HAVE_LANGINFO_H) && defined(CODESET)
+	char *codeset;
+
+	/* On Unix, set the file system encoding according to the
+	   user's preference, if the CODESET names a well-known
+	   Python codec, and Py_FileSystemDefaultEncoding isn't
+	   initialized by other means. Also set the encoding of
+	   stdin and stdout if these are terminals.  */
+	codeset = get_codeset();
+	if (codeset == NULL) {
+		fprintf(stderr,
+			"Unable to get the locale encoding: "
+			"fallback to utf-8\n");
+		Py_FileSystemDefaultEncoding = "utf-8";
+		Py_HasFileSystemDefaultEncoding = 1;
+	} else {
+		Py_FileSystemDefaultEncoding = codeset;
+	}
+#endif
+
+	codec = _PyCodec_Lookup(Py_FileSystemDefaultEncoding);
+	if (!codec) {
+		Py_FatalError(
+		    "Py_Initialize: unable to load the file system codec");
+	} else {
+		Py_DECREF(codec);
+	}
+}
+
 /* Import the site module (not into __main__ though) */
 
 static void
Index: Python/bltinmodule.c
===================================================================
--- Python/bltinmodule.c	(révision 80702)
+++ Python/bltinmodule.c	(copie de travail)
@@ -21,9 +21,12 @@
 #elif defined(__APPLE__)
 const char *Py_FileSystemDefaultEncoding = "utf-8";
 int Py_HasFileSystemDefaultEncoding = 1;
+#elif defined(HAVE_LANGINFO_H) && defined(CODESET)
+const char *Py_FileSystemDefaultEncoding = NULL; /* set by initfsencoding() */
+int Py_HasFileSystemDefaultEncoding = 0;
 #else
-const char *Py_FileSystemDefaultEncoding = NULL; /* use default */
-int Py_HasFileSystemDefaultEncoding = 0;
+const char *Py_FileSystemDefaultEncoding = "utf-8";
+int Py_HasFileSystemDefaultEncoding = 1;
 #endif
 
 int