From: Jack Jansen Date: Sat, 15 Jul 2000 22:31:45 +0000 (+0000) Subject: Implemented getdefaultlocale() for macintosh, after an idea by Fredrik. X-Git-Tag: v2.0b1~813 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=307d7a426fee7433e48eb93498d4f250da739589;p=python Implemented getdefaultlocale() for macintosh, after an idea by Fredrik. --- diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c index 5b56afe4b6..e32e81bd3b 100644 --- a/Modules/_localemodule.c +++ b/Modules/_localemodule.c @@ -24,7 +24,7 @@ This software comes with no warranty. Use at your own risk. #endif #ifdef macintosh -char *strdup(char *); +#include "macglue.h" #endif static char locale__doc__[] = "Support for POSIX locales."; @@ -380,12 +380,20 @@ PyLocale_getdefaultlocale(PyObject* self, PyObject* args) } #endif +#if defined(macintosh) +static PyObject* +PyLocale_getdefaultlocale(PyObject* self, PyObject* args) +{ + return Py_BuildValue("Os", Py_None, PyMac_getscript()); +} +#endif + static struct PyMethodDef PyLocale_Methods[] = { {"setlocale", (PyCFunction) PyLocale_setlocale, 1, setlocale__doc__}, {"localeconv", (PyCFunction) PyLocale_localeconv, 0, localeconv__doc__}, {"strcoll", (PyCFunction) PyLocale_strcoll, 1, strcoll__doc__}, {"strxfrm", (PyCFunction) PyLocale_strxfrm, 1, strxfrm__doc__}, -#if defined(MS_WIN32) +#if defined(MS_WIN32) || defined(macintosh) {"_getdefaultlocale", (PyCFunction) PyLocale_getdefaultlocale, 0}, #endif {NULL, NULL}