mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Three patches by Amaury Forgeot d'Arc; SF patch# 1754484.

Browse source
This commit is contained in:
Guido van Rossum 2007-07-16 20:46:27 +00:00
parent 27ae52362c
commit 307fa8cc82
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Objects/unicodeobject.c
View file

@ -851,7 +851,7 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)
fail: fail:
if (callresults) { if (callresults) {
PyObject **callresult2 = callresults; PyObject **callresult2 = callresults;
while (callresult2 <= callresult) { while (callresult2 < callresult) {
Py_DECREF(*callresult2); Py_DECREF(*callresult2);
++callresult2; ++callresult2;
} }

14
Python/bltinmodule.c
View file

@ -314,14 +314,17 @@ builtin_chr(PyObject *self, PyObject *args)
return PyUnicode_FromOrdinal(x); return PyUnicode_FromOrdinal(x);
} }
PyDoc_STRVAR(chr_doc, PyDoc_VAR(chr_doc) = PyDoc_STR(
"chr(i) -> Unicode character\n\ "chr(i) -> Unicode character\n\
\n\ \n\
Return a Unicode string of one character with ordinal i; 0 <= i <= 0x10ffff." Return a Unicode string of one character with ordinal i; 0 <= i <= 0x10ffff."
)
#ifndef Py_UNICODE_WIDE #ifndef Py_UNICODE_WIDE
PyDoc_STR(
"\nIf 0x10000 <= i, a surrogate pair is returned." "\nIf 0x10000 <= i, a surrogate pair is returned."
)
#endif #endif
); ;
static PyObject * static PyObject *
@ -1219,14 +1222,17 @@ builtin_ord(PyObject *self, PyObject* obj)
return NULL; return NULL;
} }
PyDoc_STRVAR(ord_doc, PyDoc_VAR(ord_doc) = PyDoc_STR(
"ord(c) -> integer\n\ "ord(c) -> integer\n\
\n\ \n\
Return the integer ordinal of a one-character string." Return the integer ordinal of a one-character string."
)
#ifndef Py_UNICODE_WIDE #ifndef Py_UNICODE_WIDE
PyDoc_STR(
"\nA valid surrogate pair is also accepted." "\nA valid surrogate pair is also accepted."
)
#endif #endif
); ;
static PyObject * static PyObject *

8
Python/errors.c
View file

@ -333,9 +333,9 @@ PyErr_SetFromErrnoWithFilenameObject(PyObject *exc, PyObject *filenameObject)
#endif /* Unix/Windows */ #endif /* Unix/Windows */
#endif /* PLAN 9*/ #endif /* PLAN 9*/
if (filenameObject != NULL) if (filenameObject != NULL)
v = Py_BuildValue("(isO)", i, s, filenameObject); v = Py_BuildValue("(iUO)", i, s, filenameObject);
else else
v = Py_BuildValue("(is)", i, s); v = Py_BuildValue("(iU)", i, s);
if (v != NULL) { if (v != NULL) {
PyErr_SetObject(exc, v); PyErr_SetObject(exc, v);
Py_DECREF(v); Py_DECREF(v);
@ -413,9 +413,9 @@ PyObject *PyErr_SetExcFromWindowsErrWithFilenameObject(
s[--len] = '\0'; s[--len] = '\0';
} }
if (filenameObject != NULL) if (filenameObject != NULL)
v = Py_BuildValue("(isO)", err, s, filenameObject); v = Py_BuildValue("(iUO)", err, s, filenameObject);
else else
v = Py_BuildValue("(is)", err, s); v = Py_BuildValue("(iU)", err, s);
if (v != NULL) { if (v != NULL) {
PyErr_SetObject(exc, v); PyErr_SetObject(exc, v);
Py_DECREF(v); Py_DECREF(v);