mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
Merge 3.3.
This commit is contained in:
commit
fc55bb1cc5
3 changed files with 35 additions and 2 deletions
|
@ -2047,6 +2047,11 @@ class UsabilityTest(unittest.TestCase):
|
|||
self.assertIs(type(d), MyDecimal)
|
||||
self.assertEqual(d, d1)
|
||||
|
||||
a = Decimal('1.0')
|
||||
b = MyDecimal(a)
|
||||
self.assertIs(type(b), MyDecimal)
|
||||
self.assertEqual(a, b)
|
||||
|
||||
def test_implicit_context(self):
|
||||
Decimal = self.decimal.Decimal
|
||||
getcontext = self.decimal.getcontext
|
||||
|
|
|
@ -110,6 +110,9 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #16431: Use the type information when constructing a Decimal subtype
|
||||
from a Decimal argument.
|
||||
|
||||
- Issue #15641: Clean up deprecated classes from importlib
|
||||
Patch by Taras Lyapun.
|
||||
|
||||
|
|
|
@ -2338,6 +2338,32 @@ PyDecType_FromFloat(PyTypeObject *type, PyObject *v,
|
|||
return dec;
|
||||
}
|
||||
|
||||
/* Return a new PyDecObject (subtype) from a Decimal. */
|
||||
static PyObject *
|
||||
PyDecType_FromDecimalExact(PyTypeObject *type, PyObject *v, PyObject *context)
|
||||
{
|
||||
PyObject *dec;
|
||||
uint32_t status = 0;
|
||||
|
||||
if (type == &PyDec_Type) {
|
||||
Py_INCREF(v);
|
||||
return v;
|
||||
}
|
||||
|
||||
dec = PyDecType_New(type);
|
||||
if (dec == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
mpd_qcopy(MPD(dec), MPD(v), &status);
|
||||
if (dec_addstatus(context, status)) {
|
||||
Py_DECREF(dec);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return dec;
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
sequence_as_tuple(PyObject *v, PyObject *ex, const char *mesg)
|
||||
{
|
||||
|
@ -2642,8 +2668,7 @@ PyDecType_FromObjectExact(PyTypeObject *type, PyObject *v, PyObject *context)
|
|||
return PyDecType_FromSsizeExact(type, 0, context);
|
||||
}
|
||||
else if (PyDec_Check(v)) {
|
||||
Py_INCREF(v);
|
||||
return v;
|
||||
return PyDecType_FromDecimalExact(type, v, context);
|
||||
}
|
||||
else if (PyUnicode_Check(v)) {
|
||||
return PyDecType_FromUnicodeExactWS(type, v, context);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue