Mercurial > cpython-lru_cache-weakref
diff Objects/floatobject.c @ 47527:52294af4b663 legacy-trunk
This reverts r63675 based on the discussion in this thread:
http://mail.python.org/pipermail/python-dev/2008-June/079988.html
Python 2.6 should stick with PyString_* in its codebase. The PyBytes_* names
in the spirit of 3.0 are available via a #define only. See the email thread.
| author | Gregory P. Smith <greg@mad-scientist.com> |
|---|---|
| date | Mon, 09 Jun 2008 04:58:54 +0000 |
| parents | 47ef9a806ce9 |
| children | 4267adacdd52 |
line wrap: on
line diff
--- a/Objects/floatobject.c Mon Jun 09 01:28:30 2008 +0000 +++ b/Objects/floatobject.c Mon Jun 09 04:58:54 2008 +0000 @@ -182,9 +182,9 @@ if (pend) *pend = NULL; - if (PyBytes_Check(v)) { - s = PyBytes_AS_STRING(v); - len = PyBytes_GET_SIZE(v); + if (PyString_Check(v)) { + s = PyString_AS_STRING(v); + len = PyString_GET_SIZE(v); } #ifdef Py_USING_UNICODE else if (PyUnicode_Check(v)) { @@ -485,7 +485,7 @@ char buf[100]; format_float(buf, sizeof(buf), v, PREC_REPR); - return PyBytes_FromString(buf); + return PyString_FromString(buf); } static PyObject * @@ -493,7 +493,7 @@ { char buf[100]; format_float(buf, sizeof(buf), v, PREC_STR); - return PyBytes_FromString(buf); + return PyString_FromString(buf); } /* Comparison is pretty much a nightmare. When comparing float to float, @@ -1218,7 +1218,7 @@ return float_subtype_new(type, args, kwds); /* Wimp out */ if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:float", kwlist, &x)) return NULL; - if (PyBytes_Check(x)) + if (PyString_Check(x)) return PyFloat_FromString(x, NULL); return PyNumber_Float(x); } @@ -1269,13 +1269,13 @@ char* s; float_format_type r; - if (!PyBytes_Check(arg)) { + if (!PyString_Check(arg)) { PyErr_Format(PyExc_TypeError, "__getformat__() argument must be string, not %.500s", Py_TYPE(arg)->tp_name); return NULL; } - s = PyBytes_AS_STRING(arg); + s = PyString_AS_STRING(arg); if (strcmp(s, "double") == 0) { r = double_format; } @@ -1291,11 +1291,11 @@ switch (r) { case unknown_format: - return PyBytes_FromString("unknown"); + return PyString_FromString("unknown"); case ieee_little_endian_format: - return PyBytes_FromString("IEEE, little-endian"); + return PyString_FromString("IEEE, little-endian"); case ieee_big_endian_format: - return PyBytes_FromString("IEEE, big-endian"); + return PyString_FromString("IEEE, big-endian"); default: Py_FatalError("insane float_format or double_format"); return NULL;