Skip to content

Commit 5500734

Browse files
authored
Merge branch 'main' into close-response-in-http-client-tunnel
2 parents 959db96 + c9134fb commit 5500734

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

Doc/using/unix.rst

-7
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,6 @@ On FreeBSD and OpenBSD
5454
pkg_add ftp://ftp.openbsd.org/pub/OpenBSD/4.2/packages/i386/python-2.5.1p2.tgz
5555

5656

57-
On OpenSolaris
58-
--------------
59-
60-
You can get Python from `OpenCSW <https://www.opencsw.org/>`_. Various versions
61-
of Python are available and can be installed with e.g. ``pkgutil -i python27``.
62-
63-
6457
.. _building-python-on-unix:
6558

6659
Building Python

Objects/typeobject.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -6706,7 +6706,6 @@ type_ready_mro(PyTypeObject *type)
67066706
and static builtin types must have static builtin bases. */
67076707
if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) {
67086708
assert(type->tp_flags & Py_TPFLAGS_IMMUTABLETYPE);
6709-
int isbuiltin = type->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN;
67106709
PyObject *mro = type->tp_mro;
67116710
Py_ssize_t n = PyTuple_GET_SIZE(mro);
67126711
for (Py_ssize_t i = 0; i < n; i++) {
@@ -6718,7 +6717,8 @@ type_ready_mro(PyTypeObject *type)
67186717
type->tp_name, base->tp_name);
67196718
return -1;
67206719
}
6721-
assert(!isbuiltin || (base->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN));
6720+
assert(!(type->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN) ||
6721+
(base->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN));
67226722
}
67236723
}
67246724
return 0;

0 commit comments

Comments
 (0)