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

Revert 64451.

This commit is contained in:
Raymond Hettinger 2008-06-24 22:28:56 +00:00
parent 11c1a3326f
commit 5c960b8c64
4 changed files with 1 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Include/floatobject.h
View File

@ -111,8 +111,6 @@ PyAPI_FUNC(PyObject *) _PyFloat_FormatAdvanced(PyObject *obj,
Py_UNICODE *format_spec,
Py_ssize_t format_spec_len);
PyAPI_FUNC(PyObject *) _float_to_base(PyObject *v, int base);
#ifdef __cplusplus
}
#endif

27
Lib/test/test_builtin.py
View File

@ -553,15 +553,6 @@ class BuiltinTest(unittest.TestCase):
self.assertEqual(hex(-16), '-0x10')
self.assertEqual(hex(-16), '-0x10')
self.assertRaises(TypeError, hex, {})
self.assertEqual(hex(3.125), '0x19 * 2.0 ** -3')
self.assertEqual(hex(0.0), '0x0 * 2.0 ** 0')
for sv in float('nan'), float('inf'), float('-inf'):
self.assertEqual(hex(sv), repr(sv))
for i in range(100):
x = random.expovariate(.05)
self.assertEqual(eval(hex(x)), x, (x, hex(x), eval(hex(x))))
self.assertEqual(eval(hex(-x)), -x)
self.assertEqual(hex(-x), ('-' + hex(x)))
def test_id(self):
id(None)
@ -805,15 +796,6 @@ class BuiltinTest(unittest.TestCase):
self.assertEqual(oct(-100), '-0o144')
self.assertEqual(oct(-100), '-0o144')
self.assertRaises(TypeError, oct, ())
self.assertEqual(oct(3.125), '0o31 * 2.0 ** -3')
self.assertEqual(oct(0.0), '0o0 * 2.0 ** 0')
for sv in float('nan'), float('inf'), float('-inf'):
self.assertEqual(oct(sv), repr(sv))
for i in range(100):
x = random.expovariate(.05)
self.assertEqual(eval(oct(x)), x)
self.assertEqual(eval(oct(-x)), -x)
self.assertEqual(oct(-x), ('-' + oct(x)))
def write_testfile(self):
# NB the first 4 lines are also used to test input, below
@ -1231,15 +1213,6 @@ class BuiltinTest(unittest.TestCase):
self.assertEqual(bin(2**65-1), '0b' + '1' * 65)
self.assertEqual(bin(-(2**65)), '-0b1' + '0' * 65)
self.assertEqual(bin(-(2**65-1)), '-0b' + '1' * 65)
self.assertEqual(bin(3.125), '0b11001 * 2.0 ** -3')
self.assertEqual(bin(0.0), '0b0 * 2.0 ** 0')
for sv in float('nan'), float('inf'), float('-inf'):
self.assertEqual(bin(sv), repr(sv))
for i in range(100):
x = random.expovariate(.05)
self.assertEqual(eval(bin(x)), x)
self.assertEqual(eval(bin(-x)), -x)
self.assertEqual(bin(-x), ('-' + bin(x)))
class TestSorted(unittest.TestCase):

5
Objects/abstract.c
View File

@ -1451,11 +1451,8 @@ PyObject *
PyNumber_ToBase(PyObject *n, int base)
{
PyObject *res = NULL;
PyObject *index;
PyObject *index = PyNumber_Index(n);
if (PyFloat_Check(n))
return _float_to_base(n, base);
index = PyNumber_Index(n);
if (!index)
return NULL;
if (PyLong_Check(index))

30
Objects/floatobject.c
View File

@ -1113,36 +1113,6 @@ PyDoc_STRVAR(float_as_integer_ratio_doc,
">>> (-.25).as_integer_ratio()\n"
"(-1, 4)");
PyObject *
_float_to_base(PyObject *v, int base)
{
PyObject *mant, *conv, *result;
double x, fr;
int i, exp;
if (!PyFloat_Check(v)) {
PyErr_BadInternalCall();
return NULL;
}
CONVERT_TO_DOUBLE(v, x);
if (!Py_IS_FINITE(x))
return PyObject_Repr(v);
fr = frexp(x, &exp);
for (i=0; i<300 && fr != floor(fr) ; i++) {
fr *= 2.0;
exp--;
}
mant = PyLong_FromDouble(floor(fr));
if (mant == NULL)
return NULL;
conv = PyNumber_ToBase(mant, base);
Py_DECREF(mant);
if (conv == NULL)
return NULL;
result = PyUnicode_FromFormat("%U * 2.0 ** %d", conv, exp);
Py_DECREF(conv);
return result;
}
static PyObject *
float_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds);