diff options
| author | Alexandre Vassalotti <alexandre@peadrop.com> | 2013-12-01 00:21:20 (GMT) |
|---|---|---|
| committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2013-12-01 00:21:20 (GMT) |
| commit | 3c23e7a5dcbc1972bd9e26dc26e61d856abb51f1 (patch) | |
| tree | 600903588902508759b5ad8e3cbeb9d4b8329c1c /Objects | |
| parent | 9204af42cc271690f57a4bc0d2af53201a796b51 (diff) | |
| parent | 19b6fa6ebb887e498437b4ae87d6e70b92b4742b (diff) | |
| download | cpython-3c23e7a5dcbc1972bd9e26dc26e61d856abb51f1.zip cpython-3c23e7a5dcbc1972bd9e26dc26e61d856abb51f1.tar.gz cpython-3c23e7a5dcbc1972bd9e26dc26e61d856abb51f1.tar.bz2 | |
Issue #6477: Merge with 3.3.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/object.c b/Objects/object.c index 11718aa..8ccc91c 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1409,7 +1409,7 @@ static PyNumberMethods none_as_number = { 0, /* nb_index */ }; -static PyTypeObject PyNone_Type = { +PyTypeObject PyNone_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) "NoneType", 0, @@ -1494,7 +1494,7 @@ notimplemented_dealloc(PyObject* ignore) Py_FatalError("deallocating NotImplemented"); } -static PyTypeObject PyNotImplemented_Type = { +PyTypeObject PyNotImplemented_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) "NotImplementedType", 0, |