[Python-checkins] python/dist/src/Modules _localemodule.c,2.37,2.38

[loewis@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv24509/Modules

Modified Files:
	_localemodule.c 
Log Message:
Use wcscoll for _locale.strcoll if available.


Index: _localemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_localemodule.c,v
retrieving revision 2.37
retrieving revision 2.38
diff -C2 -d -r2.37 -r2.38
*** _localemodule.c	13 Dec 2002 15:20:53 -0000	2.37
--- _localemodule.c	21 Dec 2002 18:34:06 -0000	2.38
***************
*** 26,29 ****
--- 26,33 ----
  #endif
  
+ #ifdef HAVE_WCHAR_H
+ #include <wchar.h>
+ #endif
+ 
  #if defined(MS_WINDOWS)
  #define WIN32_LEAN_AND_MEAN
***************
*** 326,336 ****
  PyLocale_strcoll(PyObject* self, PyObject* args)
  {
!   char *s1,*s2;
! 
!   if (!PyArg_ParseTuple(args, "ss:strcoll", &s1, &s2))
!       return NULL;
!   return PyInt_FromLong(strcoll(s1, s2));
  }
  
  PyDoc_STRVAR(strxfrm__doc__,
  "string -> string. Returns a string that behaves for cmp locale-aware.");
--- 330,403 ----
  PyLocale_strcoll(PyObject* self, PyObject* args)
  {
! #if !defined(HAVE_WCSCOLL) || !defined(Py_USING_UNICODE)
!     char *s1,*s2;
!     
!     if (!PyArg_ParseTuple(args, "ss:strcoll", &s1, &s2))
!         return NULL;
!     return PyInt_FromLong(strcoll(s1, s2));
! #else
!     PyObject *os1, *os2, *result = NULL;
!     wchar_t *ws1 = NULL, *ws2 = NULL;
!     int rel1 = 0, rel2 = 0, len1, len2;
!     
!     if (!PyArg_ParseTuple(args, "OO:strcoll", &os1, &os2))
!         return NULL;
!     /* If both arguments are byte strings, use strcoll.  */
!     if (PyString_Check(os1) && PyString_Check(os2))
!         return PyInt_FromLong(strcoll(PyString_AS_STRING(os1),
!                                       PyString_AS_STRING(os2)));
!     /* If neither argument is unicode, it's an error.  */
!     if (!PyUnicode_Check(os1) && !PyUnicode_Check(os2)) {
!         PyErr_SetString(PyExc_ValueError, "strcoll arguments must be strings");
!     }
!     /* Convert the non-unicode argument to unicode. */
!     if (!PyUnicode_Check(os1)) {
!         os1 = PyUnicode_FromObject(os1);
!         if (!os1)
!             return NULL;
!         rel1 = 1;
!     }
!     if (!PyUnicode_Check(os2)) {
!         os2 = PyUnicode_FromObject(os2);
!         if (!os2) {
!             Py_DECREF(os1);
!             return NULL;
!         } 
!         rel2 = 1;
!     }
!     /* Convert the unicode strings to wchar[]. */
!     len1 = PyUnicode_GET_SIZE(os1) + 1;
!     len2 = PyUnicode_GET_SIZE(os2) + 1;
!     ws1 = PyMem_MALLOC(len1 * sizeof(wchar_t));
!     if (!ws1) {
!         PyErr_NoMemory();
!         goto done;
!     }
!     if (PyUnicode_AsWideChar((PyUnicodeObject*)os1, ws1, len1) == -1)
!         goto done;
!     ws2 = PyMem_MALLOC(len2 * sizeof(wchar_t));
!     if (!ws2) {
!         PyErr_NoMemory();
!         goto done;
!     }
!     if (PyUnicode_AsWideChar((PyUnicodeObject*)os2, ws2, len2) == -1)
!         goto done;
!     /* Collate the strings. */
!     result = PyInt_FromLong(wcscoll(ws1, ws2));
!   done:
!     /* Deallocate everything. */
!     if (ws1) PyMem_FREE(ws1);
!     if (ws2) PyMem_FREE(ws2);
!     if (rel1) {
!         Py_DECREF(os1);
!     }
!     if (rel2) {
!         Py_DECREF(os2);
!     }
!     return result;
! #endif
  }
  
+ 
  PyDoc_STRVAR(strxfrm__doc__,
  "string -> string. Returns a string that behaves for cmp locale-aware.");
***************
*** 710,711 ****
--- 777,785 ----
  #endif
  }
+ 
+ /* 
+ Local variables:
+ c-basic-offset: 4
+ indent-tabs-mode: nil
+ End:
+ */