Index: Include/classobject.h
===================================================================
--- Include/classobject.h	(révision 79517)
+++ Include/classobject.h	(copie de travail)
@@ -18,6 +18,7 @@
     PyObject	*cl_getattr;
     PyObject	*cl_setattr;
     PyObject	*cl_delattr;
+    PyObject    *cl_weakreflist; /* List of weak references */
 } PyClassObject;
 
 typedef struct {
Index: Objects/classobject.c
===================================================================
--- Objects/classobject.c	(révision 79517)
+++ Objects/classobject.c	(copie de travail)
@@ -123,6 +123,7 @@
 	op->cl_dict = dict;
 	Py_XINCREF(name);
 	op->cl_name = name;
+	op->cl_weakreflist = NULL;
 
 	op->cl_getattr = class_lookup(op, getattrstr, &dummy);
 	op->cl_setattr = class_lookup(op, setattrstr, &dummy);
@@ -188,6 +189,8 @@
 class_dealloc(PyClassObject *op)
 {
 	_PyObject_GC_UNTRACK(op);
+	if (op->cl_weakreflist != NULL)
+		PyObject_ClearWeakRefs((PyObject *) op);
 	Py_DECREF(op->cl_bases);
 	Py_DECREF(op->cl_dict);
 	Py_XDECREF(op->cl_name);
@@ -454,7 +457,7 @@
 	(traverseproc)class_traverse,		/* tp_traverse */
  	0,					/* tp_clear */
 	0,					/* tp_richcompare */
-	0,					/* tp_weaklistoffset */
+	offsetof(PyClassObject, cl_weakreflist), /* tp_weaklistoffset */
 	0,					/* tp_iter */
 	0,					/* tp_iternext */
 	0,					/* tp_methods */
Index: Lib/test/test_weakref.py
===================================================================
--- Lib/test/test_weakref.py	(révision 79517)
+++ Lib/test/test_weakref.py	(copie de travail)
@@ -685,7 +685,26 @@
         # No exception should be raised here
         gc.collect()
 
+    def test_classes(self):
+        # Check that both old-style classes and new-style classes
+        # are weakrefable.
+        class A(object):
+            pass
+        class B:
+            pass
+        l = []
+        weakref.ref(int)
+        a = weakref.ref(A, l.append)
+        A = None
+        gc.collect()
+        self.assertEqual(a(), None)
+        self.assertEqual(l, [a])
+        b = weakref.ref(B, l.append)
+        B = None
+        self.assertEqual(b(), None)
+        self.assertEqual(l, [a, b])
 
+
 class SubclassableWeakrefTestCase(TestBase):
 
     def test_subclass_refs(self):
Index: Lib/test/test_sys.py
===================================================================
--- Lib/test/test_sys.py	(révision 79517)
+++ Lib/test/test_sys.py	(copie de travail)
@@ -544,7 +544,7 @@
         class class_oldstyle():
             def method():
                 pass
-        check(class_oldstyle, size(h + '6P'))
+        check(class_oldstyle, size(h + '7P'))
         # instance (old-style class)
         check(class_oldstyle(), size(h + '3P'))
         # instancemethod (old-style class)