From ab3c1c1994ec819781ba27ba8a5c6d75f70cb2af Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sun, 1 Apr 2012 18:48:02 -0400 Subject: be consistent with rest of function --- Objects/typeobject.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Objects/typeobject.c b/Objects/typeobject.c index f0c787f..9f0ab15 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -475,9 +475,8 @@ type_set_bases(PyTypeObject *type, PyObject *value, void *context) new_base = best_base(value); - if (!new_base) { + if (!new_base) return -1; - } if (!compatible_for_assignment(type->tp_base, new_base, "__bases__")) return -1; -- cgit v0.12 From 3471bb67e7add5c809c00e5c0977047017548b40 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sun, 1 Apr 2012 18:48:40 -0400 Subject: remove extraneous condition --- Objects/typeobject.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 9f0ab15..c12cd7c 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -464,12 +464,10 @@ type_set_bases(PyTypeObject *type, PyObject *value, void *context) type->tp_name, Py_TYPE(ob)->tp_name); return -1; } - if (PyType_Check(ob)) { - if (PyType_IsSubtype((PyTypeObject*)ob, type)) { - PyErr_SetString(PyExc_TypeError, - "a __bases__ item causes an inheritance cycle"); - return -1; - } + if (PyType_IsSubtype((PyTypeObject*)ob, type)) { + PyErr_SetString(PyExc_TypeError, + "a __bases__ item causes an inheritance cycle"); + return -1; } } -- cgit v0.12 From b6af60c2a9e2625987bcdd6775eb9fe8834c9641 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sun, 1 Apr 2012 18:49:54 -0400 Subject: adjust formatting --- Objects/typeobject.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Objects/typeobject.c b/Objects/typeobject.c index c12cd7c..8cfa889 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -458,11 +458,11 @@ type_set_bases(PyTypeObject *type, PyObject *value, void *context) for (i = 0; i < PyTuple_GET_SIZE(value); i++) { ob = PyTuple_GET_ITEM(value, i); if (!PyType_Check(ob)) { - PyErr_Format( - PyExc_TypeError, - "%s.__bases__ must be tuple of old- or new-style classes, not '%s'", - type->tp_name, Py_TYPE(ob)->tp_name); - return -1; + PyErr_Format(PyExc_TypeError, + "%s.__bases__ must be tuple of old- or " + "new-style classes, not '%s'", + type->tp_name, Py_TYPE(ob)->tp_name); + return -1; } if (PyType_IsSubtype((PyTypeObject*)ob, type)) { PyErr_SetString(PyExc_TypeError, -- cgit v0.12 From d3fca8e07fbf6fd66b02ac21c40cbc1a0b36ac9c Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Mon, 2 Apr 2012 07:51:45 +0200 Subject: Post-release update. --- Include/patchlevel.h | 2 +- Misc/NEWS | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 8a8f351..f81c339 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -23,7 +23,7 @@ #define PY_RELEASE_SERIAL 2 /* Version as a string */ -#define PY_VERSION "3.3.0a2" +#define PY_VERSION "3.3.0a2+" /*--end constants--*/ /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. diff --git a/Misc/NEWS b/Misc/NEWS index 3a4dfe0..f3d874e 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -2,6 +2,18 @@ Python News +++++++++++ +What's New in Python 3.3.0 Alpha 3? +=================================== + +*Release date: XXXX-XX-XX* + +Core and Builtins +----------------- + +Library +------- + + What's New in Python 3.3.0 Alpha 2? =================================== -- cgit v0.12