Mercurial > cpython-lru_cache-weakref
diff Objects/unicodeobject.c @ 53442:6947bc3dd433 legacy-trunk
Issue #5835, deprecate PyOS_ascii_formatd.
If anyone wants to clean up the documentation, feel free. It's my first documentation foray, and it's not that great.
Will port to py3k with a different strategy.
| author | Eric Smith <eric@trueblade.com> |
|---|---|
| date | Sat, 25 Apr 2009 21:40:15 +0000 |
| parents | f05b6d9adbe6 |
| children | 1c27ecbed8c4 |
line wrap: on
line diff
--- a/Objects/unicodeobject.c Sat Apr 25 21:16:05 2009 +0000 +++ b/Objects/unicodeobject.c Sat Apr 25 21:40:15 2009 +0000 @@ -8245,11 +8245,13 @@ } static int -doubletounicode(Py_UNICODE *buffer, size_t len, const char *format, double x) +doubletounicode(Py_UNICODE *buffer, size_t len, int format_code, + int precision, int flags, double x) { Py_ssize_t result; - PyOS_ascii_formatd((char *)buffer, len, format, x); + _PyOS_double_to_string((char *)buffer, len, x, format_code, precision, + flags, NULL); result = strtounicode(buffer, (char *)buffer); return Py_SAFE_DOWNCAST(result, Py_ssize_t, int); } @@ -8276,9 +8278,6 @@ int type, PyObject *v) { - /* fmt = '%#.' + `prec` + `type` - worst case length = 3 + 10 (len of INT_MAX) + 1 = 14 (use 20)*/ - char fmt[20]; double x; x = PyFloat_AsDouble(v); @@ -8320,10 +8319,8 @@ "formatted float is too long (precision too large?)"); return -1; } - PyOS_snprintf(fmt, sizeof(fmt), "%%%s.%d%c", - (flags&F_ALT) ? "#" : "", - prec, type); - return doubletounicode(buf, buflen, fmt, x); + return doubletounicode(buf, buflen, type, prec, + (flags&F_ALT)?Py_DTSF_ALT:0, x); } static PyObject*