mirror of
https://github.com/python/cpython.git
synced 2026-05-05 01:51:01 +00:00
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.
This commit is contained in:
parent
dfcffd4044
commit
068f06568b
9 changed files with 234 additions and 68 deletions
|
|
@ -4332,9 +4332,6 @@ Py_LOCAL_INLINE(int)
|
|||
formatfloat(char *buf, size_t buflen, int flags,
|
||||
int prec, 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);
|
||||
if (x == -1.0 && PyErr_Occurred()) {
|
||||
|
|
@ -4378,10 +4375,8 @@ formatfloat(char *buf, size_t buflen, int flags,
|
|||
"formatted float is too long (precision too large?)");
|
||||
return -1;
|
||||
}
|
||||
PyOS_snprintf(fmt, sizeof(fmt), "%%%s.%d%c",
|
||||
(flags&F_ALT) ? "#" : "",
|
||||
prec, type);
|
||||
PyOS_ascii_formatd(buf, buflen, fmt, x);
|
||||
_PyOS_double_to_string(buf, buflen, x, type, prec,
|
||||
(flags&F_ALT)?Py_DTSF_ALT:0, NULL);
|
||||
return (int)strlen(buf);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue