Changeset 60 for python/trunk/Modules/_localemodule.c

Timestamp:

Oct 22, 2010, 10:46:09 PM (15 years ago)

Author:

Yuri Dario

Message:

python: use current codepage as charset in locale settings.

File:

• python/trunk/Modules/_localemodule.c (modified) (3 diffs)

python/trunk/Modules/_localemodule.c

@@ -40 +40 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#endif
+
+#if defined(__KLIBC__)
+#define INCL_DOS
+#define INCL_DOSERRORS
+#include <os2.h>
 #endif
 
@@ -445 +451 @@
 #endif
 
+#if defined(__KLIBC__)
+static PyObject*
+PyLocale_getdefaultlocale(PyObject* self)
+{
+    char encoding[100];
+    char locale[100];
+    ULONG cp[3];
+    ULONG cplen;
+
+    strcpy( locale, "");
+    if (getenv("LANG"))
+        strcpy( locale, getenv("LANG"));
+
+    strcpy( encoding, "");
+    if (DosQueryCp (sizeof (cp), cp, &cplen) == NO_ERROR)
+        PyOS_snprintf(encoding, sizeof(encoding), "CP%u", cp[0]);
+
+    return Py_BuildValue("ss", locale, encoding);
+}
+#endif
+
 #ifdef HAVE_LANGINFO_H
 #define LANGINFO(X) {#X, X}
@@ -690 +717 @@
   {"strxfrm", (PyCFunction) PyLocale_strxfrm, 
    METH_VARARGS, strxfrm__doc__},
-#if defined(MS_WINDOWS) || defined(__APPLE__)
+#if defined(MS_WINDOWS) || defined(__APPLE__) || defined(__KLIBC__)
   {"_getdefaultlocale", (PyCFunction) PyLocale_getdefaultlocale, METH_NOARGS},
 #endif