Merge 3.3.

Stefan Krah · Stefan Krah · commit 4cb103ee39b7 · 2012-11-08T11:19:55.000+01:00
diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
@@ -2029,7 +2029,7 @@ def test_subclassing(self):
         Decimal = self.decimal.Decimal
 
         class MyDecimal(Decimal):
-            pass
+            y = None
 
         d1 = MyDecimal(1)
         d2 = MyDecimal(2)
@@ -2047,14 +2047,29 @@ class MyDecimal(Decimal):
         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)
-
-        c = Decimal(b)
-        self.assertIs(type(c), Decimal)
-        self.assertEqual(a, c)
+        # Decimal(Decimal)
+        d = Decimal('1.0')
+        x = Decimal(d)
+        self.assertIs(type(x), Decimal)
+        self.assertEqual(x, d)
+
+        # MyDecimal(Decimal)
+        m = MyDecimal(d)
+        self.assertIs(type(m), MyDecimal)
+        self.assertEqual(m, d)
+        self.assertIs(m.y, None)
+
+        # Decimal(MyDecimal)
+        x = Decimal(m)
+        self.assertIs(type(x), Decimal)
+        self.assertEqual(x, d)
+
+        # MyDecimal(MyDecimal)
+        m.y = 9
+        x = MyDecimal(m)
+        self.assertIs(type(x), MyDecimal)
+        self.assertEqual(x, d)
+        self.assertIs(x.y, None)
 
     def test_implicit_context(self):
         Decimal = self.decimal.Decimal
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
@@ -2338,14 +2338,14 @@ PyDecType_FromFloat(PyTypeObject *type, PyObject *v,
     return dec;
 }
 
-/* Return a new PyDecObject (subtype) from a Decimal. */
+/* Return a new PyDecObject or a subtype from a Decimal. */
 static PyObject *
 PyDecType_FromDecimalExact(PyTypeObject *type, PyObject *v, PyObject *context)
 {
     PyObject *dec;
     uint32_t status = 0;
 
-    if (type == Py_TYPE(v)) {
+    if (type == &PyDec_Type && PyDec_CheckExact(v)) {
         Py_INCREF(v);
         return v;
     }

Original file line number	Diff line number	Diff line change
`@@ -2338,14 +2338,14 @@ PyDecType_FromFloat(PyTypeObject type, PyObject v,`
`2338`	`2338`	`return dec;`
`2339`	`2339`	`}`
`2340`	`2340`
`2341`		`-/* Return a new PyDecObject (subtype) from a Decimal. */`
	`2341`	`+/* Return a new PyDecObject or a subtype from a Decimal. */`
`2342`	`2342`	`static PyObject *`
`2343`	`2343`	`PyDecType_FromDecimalExact(PyTypeObject type, PyObject v, PyObject *context)`
`2344`	`2344`	`{`
`2345`	`2345`	`PyObject *dec;`
`2346`	`2346`	`uint32_t status = 0;`
`2347`	`2347`
`2348`		`- if (type == Py_TYPE(v)) {`
	`2348`	`+ if (type == &PyDec_Type && PyDec_CheckExact(v)) {`
`2349`	`2349`	`Py_INCREF(v);`
`2350`	`2350`	`return v;`
`2351`	`2351`	`}`