Mailman 3 September 2003 - Python-checkins

python/dist/src/Python importdl.c,2.70,2.71
by loewis＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv2698/Python Modified Files: importdl.c Log Message: Patch #794826: Add __file__ in dynamically loaded modules for multiple interpreters. Fixes #698282. Will backport to 2.3. Index: importdl.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/importdl.c,v retrieving revision 2.70 retrieving revision 2.71 diff -C2 -d -r2.70 -r2.71 *** importdl.c 26 Aug 2002 21:15:11 -0000 2.70 --- importdl.c 4 Sep 2003 18:45:59 -0000 2.71 *************** *** 55,60 **** if (PyErr_Occurred()) return NULL; - if (_PyImport_FixupExtension(name, pathname) == NULL) - return NULL; m = PyDict_GetItemString(PyImport_GetModuleDict(), name); --- 55,58 ---- *************** *** 67,70 **** --- 65,71 ---- if (PyModule_AddStringConstant(m, "__file__", pathname) < 0) PyErr_Clear(); /* Not important enough to report */ + + if (_PyImport_FixupExtension(name, pathname) == NULL) + return NULL; if (Py_VerboseFlag) PySys_WriteStderr(

1 0

[Python-checkins] python/dist/src/Doc/lib libdatetime.tex, 1.49.8.1, 1.49.8.2
by loewis＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv32202/Doc/lib Modified Files: Tag: release23-maint libdatetime.tex Log Message: Patch #792338: Correct documentation for timetuple return type. Index: libdatetime.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libdatetime.tex,v retrieving revision 1.49.8.1 retrieving revision 1.49.8.2 diff -C2 -d -r1.49.8.1 -r1.49.8.2 *** libdatetime.tex 22 Aug 2003 16:27:03 -0000 1.49.8.1 --- libdatetime.tex 4 Sep 2003 18:30:15 -0000 1.49.8.2 *************** *** 429,441 **** \begin{methoddesc}{timetuple}{} ! Return a 9-element tuple of the form returned by \function{time.localtime()}. The hours, minutes and seconds are 0, and the DST flag is -1. \code{\var{d}.timetuple()} is equivalent to ! \code{(\var{d}.year, \var{d}.month, \var{d}.day, 0, 0, 0, \var{d}.weekday(), \var{d}.toordinal() - date(\var{d}.year, 1, 1).toordinal() + 1, ! -1)} \end{methoddesc} --- 429,441 ---- \begin{methoddesc}{timetuple}{} ! Return a \class{time.struct_time} such as returned by \function{time.localtime()}. The hours, minutes and seconds are 0, and the DST flag is -1. \code{\var{d}.timetuple()} is equivalent to ! \code{time.struct_time((\var{d}.year, \var{d}.month, \var{d}.day, 0, 0, 0, \var{d}.weekday(), \var{d}.toordinal() - date(\var{d}.year, 1, 1).toordinal() + 1, ! -1))} \end{methoddesc} *************** *** 859,870 **** \begin{methoddesc}{timetuple}{} ! Return a 9-element tuple of the form returned by \function{time.localtime()}. \code{\var{d}.timetuple()} is equivalent to ! \code{(\var{d}.year, \var{d}.month, \var{d}.day, \var{d}.hour, \var{d}.minute, \var{d}.second, \var{d}.weekday(), \var{d}.toordinal() - date(\var{d}.year, 1, 1).toordinal() + 1, ! dst)} The \member{tm_isdst} flag of the result is set according to the \method{dst()} method: if \member{tzinfo} is \code{None} or --- 859,870 ---- \begin{methoddesc}{timetuple}{} ! Return a \class{time.struct_time} such as returned by \function{time.localtime()}. \code{\var{d}.timetuple()} is equivalent to ! \code{time.struct_time((\var{d}.year, \var{d}.month, \var{d}.day, \var{d}.hour, \var{d}.minute, \var{d}.second, \var{d}.weekday(), \var{d}.toordinal() - date(\var{d}.year, 1, 1).toordinal() + 1, ! dst))} The \member{tm_isdst} flag of the result is set according to the \method{dst()} method: if \member{tzinfo} is \code{None} or *************** *** 882,886 **** If \var{d} is aware, \var{d} is normalized to UTC time, by subtracting ! \code{\var{d}.utcoffset()}, and a timetuple for the normalized time is returned. \member{tm_isdst} is forced to 0. Note that the result's \member{tm_year} member may be --- 882,886 ---- If \var{d} is aware, \var{d} is normalized to UTC time, by subtracting ! \code{\var{d}.utcoffset()}, and a \class{time.struct_time} for the normalized time is returned. \member{tm_isdst} is forced to 0. Note that the result's \member{tm_year} member may be

1 0

python/dist/src/Doc/lib libdatetime.tex, 1.49, 1.50
by loewis＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv31912/Doc/lib Modified Files: libdatetime.tex Log Message: Patch #792338: Correct documentation for timetuple return type. Index: libdatetime.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libdatetime.tex,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** libdatetime.tex 16 Jul 2003 21:14:35 -0000 1.49 --- libdatetime.tex 4 Sep 2003 18:29:53 -0000 1.50 *************** *** 429,441 **** \begin{methoddesc}{timetuple}{} ! Return a 9-element tuple of the form returned by \function{time.localtime()}. The hours, minutes and seconds are 0, and the DST flag is -1. \code{\var{d}.timetuple()} is equivalent to ! \code{(\var{d}.year, \var{d}.month, \var{d}.day, 0, 0, 0, \var{d}.weekday(), \var{d}.toordinal() - date(\var{d}.year, 1, 1).toordinal() + 1, ! -1)} \end{methoddesc} --- 429,441 ---- \begin{methoddesc}{timetuple}{} ! Return a \class{time.struct_time} such as returned by \function{time.localtime()}. The hours, minutes and seconds are 0, and the DST flag is -1. \code{\var{d}.timetuple()} is equivalent to ! \code{time.struct_time((\var{d}.year, \var{d}.month, \var{d}.day, 0, 0, 0, \var{d}.weekday(), \var{d}.toordinal() - date(\var{d}.year, 1, 1).toordinal() + 1, ! -1))} \end{methoddesc} *************** *** 859,870 **** \begin{methoddesc}{timetuple}{} ! Return a 9-element tuple of the form returned by \function{time.localtime()}. \code{\var{d}.timetuple()} is equivalent to ! \code{(\var{d}.year, \var{d}.month, \var{d}.day, \var{d}.hour, \var{d}.minute, \var{d}.second, \var{d}.weekday(), \var{d}.toordinal() - date(\var{d}.year, 1, 1).toordinal() + 1, ! dst)} The \member{tm_isdst} flag of the result is set according to the \method{dst()} method: \member{tzinfo} is \code{None} or --- 859,870 ---- \begin{methoddesc}{timetuple}{} ! Return a \class{time.struct_time} such as returned by \function{time.localtime()}. \code{\var{d}.timetuple()} is equivalent to ! \code{time.struct_time((\var{d}.year, \var{d}.month, \var{d}.day, \var{d}.hour, \var{d}.minute, \var{d}.second, \var{d}.weekday(), \var{d}.toordinal() - date(\var{d}.year, 1, 1).toordinal() + 1, ! dst))} The \member{tm_isdst} flag of the result is set according to the \method{dst()} method: \member{tzinfo} is \code{None} or *************** *** 882,886 **** If \var{d} is aware, \var{d} is normalized to UTC time, by subtracting ! \code{\var{d}.utcoffset()}, and a timetuple for the normalized time is returned. \member{tm_isdst} is forced to 0. Note that the result's \member{tm_year} member may be --- 882,886 ---- If \var{d} is aware, \var{d} is normalized to UTC time, by subtracting ! \code{\var{d}.utcoffset()}, and a \class{time.struct_time} for the normalized time is returned. \member{tm_isdst} is forced to 0. Note that the result's \member{tm_year} member may be

1 0

[Python-checkins] python/dist/src/Modules _localemodule.c, 2.40.4.1, 2.40.4.2
by loewis＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1:/tmp/cvs-serv31547/Modules Modified Files: Tag: release23-maint _localemodule.c Log Message: Patch #798145: Return correct information from nl_langinfo(RADIXCHAR). Index: _localemodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_localemodule.c,v retrieving revision 2.40.4.1 retrieving revision 2.40.4.2 diff -C2 -d -r2.40.4.1 -r2.40.4.2 *** _localemodule.c 3 Sep 2003 04:53:15 -0000 2.40.4.1 --- _localemodule.c 4 Sep 2003 18:26:07 -0000 2.40.4.2 *************** *** 580,583 **** --- 580,595 ---- returns numeric values in the char* return value, which would crash PyString_FromString. */ + #ifdef RADIXCHAR + if (saved_numeric) { + if(item == RADIXCHAR) { + Py_INCREF(decimal_point); + return decimal_point; + } + if(item == THOUSEP) { + Py_INCREF(thousands_sep); + return thousands_sep; + } + } + #endif for (i = 0; langinfo_constants[i].name; i++) if (langinfo_constants[i].value == item)

1 0

python/dist/src/Misc NEWS,1.831.4.29,1.831.4.30
by loewis＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1:/tmp/cvs-serv31547/Misc Modified Files: Tag: release23-maint NEWS Log Message: Patch #798145: Return correct information from nl_langinfo(RADIXCHAR). Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.831.4.29 retrieving revision 1.831.4.30 diff -C2 -d -r1.831.4.29 -r1.831.4.30 *** NEWS 3 Sep 2003 05:15:18 -0000 1.831.4.29 --- NEWS 4 Sep 2003 18:26:06 -0000 1.831.4.30 *************** *** 21,24 **** --- 21,26 ---- ----------------- + - Patch #798145: Return correct information from nl_langinfo(RADIXCHAR). + - Bug #797447: Correct confusing error message for unsupported locales.

1 0

python/dist/src/Modules _localemodule.c, 2.41, 2.42
by loewis＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1:/tmp/cvs-serv31045/Modules Modified Files: _localemodule.c Log Message: Patch #798145: Return correct information from nl_langinfo(RADIXCHAR). Will backport to 2.3. Index: _localemodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_localemodule.c,v retrieving revision 2.41 retrieving revision 2.42 diff -C2 -d -r2.41 -r2.42 *** _localemodule.c 3 Sep 2003 04:50:13 -0000 2.41 --- _localemodule.c 4 Sep 2003 18:24:47 -0000 2.42 *************** *** 580,583 **** --- 580,595 ---- returns numeric values in the char* return value, which would crash PyString_FromString. */ + #ifdef RADIXCHAR + if (saved_numeric) { + if(item == RADIXCHAR) { + Py_INCREF(decimal_point); + return decimal_point; + } + if(item == THOUSEP) { + Py_INCREF(thousands_sep); + return thousands_sep; + } + } + #endif for (i = 0; langinfo_constants[i].name; i++) if (langinfo_constants[i].value == item)

1 0

python/dist/src/Lib/test test__locale.py, NONE, 1.1
by loewis＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv31045/Lib/test Added Files: test__locale.py Log Message: Patch #798145: Return correct information from nl_langinfo(RADIXCHAR). Will backport to 2.3. --- NEW FILE: test__locale.py --- from test.test_support import verbose, TestSkipped from _locale import setlocale, LC_NUMERIC, RADIXCHAR, THOUSEP, nl_langinfo from _locale import localeconv, Error candidate_locales = ['es_UY', 'fr_FR', 'fi_FI', 'es_CO', 'pt_PT', 'it_IT', 'et_EE', 'es_PY', 'no_NO', 'nl_NL', 'lv_LV', 'el_GR', 'be_BY', 'fr_BE', 'ro_RO', 'ru_UA', 'ru_RU', 'es_VE', 'ca_ES', 'se_NO', 'es_EC', 'id_ID', 'ka_GE', 'es_CL', 'hu_HU', 'wa_BE', 'lt_LT', 'sl_SI', 'hr_HR', 'es_AR', 'es_ES', 'oc_FR', 'gl_ES', 'bg_BG', 'is_IS', 'mk_MK', 'de_AT', 'pt_BR', 'da_DK', 'nn_NO', 'cs_CZ', 'de_LU', 'es_BO', 'sq_AL', 'sk_SK', 'fr_CH', 'de_DE', 'sr_YU', 'br_FR', 'nl_BE', 'sv_FI', 'pl_PL', 'fr_CA', 'fo_FO', 'bs_BA', 'fr_LU', 'kl_GL', 'fa_IR', 'de_BE', 'sv_SE', 'it_CH', 'uk_UA', 'eu_ES', 'vi_VN', 'af_ZA', 'nb_NO', 'en_DK', 'tg_TJ'] saw_locale = 0 for loc in candidate_locales: try: setlocale(LC_NUMERIC, loc) except Error: continue if verbose: print "locale %r" % loc saw_locale = 1 nl_radixchar = nl_langinfo(RADIXCHAR) li_radixchar = localeconv()['decimal_point'] if nl_radixchar != li_radixchar: print "%r != %r" % (nl_radixchar, li_radixchar) nl_radixchar = nl_langinfo(THOUSEP) li_radixchar = localeconv()['thousands_sep'] if nl_radixchar != li_radixchar: print "%r != %r" % (nl_radixchar, li_radixchar) if not saw_locale: raise ImportError, "None of the listed locales found"

1 0

python/dist/src/Python import.c, 2.222, 2.223 marshal.c, 1.74, 1.75
by jlt63＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv18555/Python Modified Files: import.c marshal.c Log Message: Bug #794140: cygwin builds do not embed The embed2.diff patch solves the user's problem by exporting the missing symbols from the Python core so Python can be embedded in another Cygwin application (well, at lest vim). Index: import.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/import.c,v retrieving revision 2.222 retrieving revision 2.223 diff -C2 -d -r2.222 -r2.223 *** import.c 11 Jul 2003 15:01:02 -0000 2.222 --- import.c 4 Sep 2003 11:59:50 -0000 2.223 *************** *** 2842,2846 **** } ! void initimp(void) { --- 2842,2846 ---- } ! PyMODINIT_FUNC initimp(void) { Index: marshal.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/marshal.c,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** marshal.c 30 Jul 2002 11:44:44 -0000 1.74 --- marshal.c 4 Sep 2003 11:59:50 -0000 1.75 *************** *** 876,880 **** }; ! void PyMarshal_Init(void) { --- 876,880 ---- }; ! PyMODINIT_FUNC PyMarshal_Init(void) {

1 0

python/dist/src/Modules gcmodule.c,2.71,2.72
by jlt63＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1:/tmp/cvs-serv18555/Modules Modified Files: gcmodule.c Log Message: Bug #794140: cygwin builds do not embed The embed2.diff patch solves the user's problem by exporting the missing symbols from the Python core so Python can be embedded in another Cygwin application (well, at lest vim). Index: gcmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/gcmodule.c,v retrieving revision 2.71 retrieving revision 2.72 diff -C2 -d -r2.71 -r2.72 *** gcmodule.c 17 Apr 2003 17:29:21 -0000 2.71 --- gcmodule.c 4 Sep 2003 11:59:50 -0000 2.72 *************** *** 952,956 **** }; ! void initgc(void) { --- 952,956 ---- }; ! PyMODINIT_FUNC initgc(void) {

1 0

python/dist/src/Include pyport.h,2.62,2.63
by jlt63＠users.sourceforge.net 04 Sep '03

04 Sep '03

Update of /cvsroot/python/python/dist/src/Include In directory sc8-pr-cvs1:/tmp/cvs-serv18555/Include Modified Files: pyport.h Log Message: Bug #794140: cygwin builds do not embed The embed2.diff patch solves the user's problem by exporting the missing symbols from the Python core so Python can be embedded in another Cygwin application (well, at lest vim). Index: pyport.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/pyport.h,v retrieving revision 2.62 retrieving revision 2.63 diff -C2 -d -r2.62 -r2.63 *** pyport.h 4 Sep 2003 11:04:06 -0000 2.62 --- pyport.h 4 Sep 2003 11:59:50 -0000 2.63 *************** *** 429,433 **** # define PyAPI_DATA(RTYPE) extern __declspec(dllexport) RTYPE /* module init functions inside the core need no external linkage */ ! # define PyMODINIT_FUNC void # else /* Py_BUILD_CORE */ /* Building an extension module, or an embedded situation */ --- 429,438 ---- # define PyAPI_DATA(RTYPE) extern __declspec(dllexport) RTYPE /* module init functions inside the core need no external linkage */ ! /* except for Cygwin to handle embedding (FIXME: BeOS too?) */ ! # if defined(__CYGWIN__) ! # define PyMODINIT_FUNC __declspec(dllexport) void ! # else /* __CYGWIN__ */ ! # define PyMODINIT_FUNC void ! # endif /* __CYGWIN__ */ # else /* Py_BUILD_CORE */ /* Building an extension module, or an embedded situation */

1 0