traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change %c format specifier for PyArg_ParseTuple() so that it accepts 

a unicode character (an int * must be passed as the argument).

Change %c format specifier for Py_BuildValue() so that it outputs
a unicode object.

Fix datetime.datetime.isoformat(), so that it works if sep is
a unicode character > U+00FF.
This commit is contained in:
Walter Dörwald 2007-06-20 11:02:38 +00:00
parent 32a4c71419
commit bc1f886170
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/test/test_datetime.py
View File

@ -2749,6 +2749,7 @@ class TestDateTimeTZ(TestDateTime, TZInfoBase, unittest.TestCase):
self.assertEqual(iso, datestr + 'T' + tailstr) self.assertEqual(iso, datestr + 'T' + tailstr)
self.assertEqual(iso, d.isoformat('T')) self.assertEqual(iso, d.isoformat('T'))
self.assertEqual(d.isoformat('k'), datestr + 'k' + tailstr) self.assertEqual(d.isoformat('k'), datestr + 'k' + tailstr)
self.assertEqual(d.isoformat('\u1234'), datestr + '\u1234' + tailstr)
self.assertEqual(str(d), datestr + ' ' + tailstr) self.assertEqual(str(d), datestr + ' ' + tailstr)
def test_replace(self): def test_replace(self):

2
Modules/datetimemodule.c
View File

@ -4027,7 +4027,7 @@ datetime_str(PyDateTime_DateTime *self)
static PyObject * static PyObject *
datetime_isoformat(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) datetime_isoformat(PyDateTime_DateTime *self, PyObject *args, PyObject *kw)
{ {
char sep = 'T'; int sep = 'T';
static char *keywords[] = {"sep", NULL}; static char *keywords[] = {"sep", NULL};
char buffer[100]; char buffer[100];
PyObject *result; PyObject *result;

7
Python/getargs.c
View File

@ -761,15 +761,14 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
#endif /* WITHOUT_COMPLEX */ #endif /* WITHOUT_COMPLEX */
case 'c': {/* char */ case 'c': {/* char */
char *p = va_arg(*p_va, char *); int *p = va_arg(*p_va, int *);
if (PyString_Check(arg) && PyString_Size(arg) == 1) if (PyString_Check(arg) && PyString_Size(arg) == 1)
*p = PyString_AS_STRING(arg)[0]; *p = PyString_AS_STRING(arg)[0];
else if (PyUnicode_Check(arg) && else if (PyUnicode_Check(arg) &&
PyUnicode_GET_SIZE(arg) == 1 && PyUnicode_GET_SIZE(arg) == 1)
PyUnicode_AS_UNICODE(arg)[0] < 256)
*p = PyUnicode_AS_UNICODE(arg)[0]; *p = PyUnicode_AS_UNICODE(arg)[0];
else else
return converterr("char < 256", arg, msgbuf, bufsize); return converterr("char", arg, msgbuf, bufsize);
break; break;
} }

19
Python/modsupport.c
View File

@ -385,9 +385,22 @@ do_mkvalue(const char **p_format, va_list *p_va, int flags)
case 'c': case 'c':
{ {
char p[1]; int i = va_arg(*p_va, int);
p[0] = (char)va_arg(*p_va, int); Py_UNICODE c;
return PyString_FromStringAndSize(p, 1); if (i < 0 || i > PyUnicode_GetMax()) {
#ifdef Py_UNICODE_WIDE
PyErr_SetString(PyExc_OverflowError,
"%c arg not in range(0x110000) "
"(wide Python build)");
#else
PyErr_SetString(PyExc_OverflowError,
"%c arg not in range(0x10000) "
"(narrow Python build)");
#endif
return NULL;
}
c = i;
return PyUnicode_FromUnicode(&c, 1);
} }
case 's': case 's':