python
diff --git a/‎Doc/using/unix.rst‎
Lines changed: 0 additions & 7 deletions b/‎Doc/using/unix.rst‎
Lines changed: 0 additions & 7 deletions
diff --git a/‎Objects/typeobject.c‎
Lines changed: 2 additions & 2 deletions b/‎Objects/typeobject.c‎
Lines changed: 2 additions & 2 deletions
@@ -54,13 +54,6 @@ On FreeBSD and OpenBSD
      pkg_add ftp://ftp.openbsd.org/pub/OpenBSD/4.2/packages/i386/python-2.5.1p2.tgz
 
 
-On OpenSolaris
---------------
-
-You can get Python from `OpenCSW <https://www.opencsw.org/>`_.  Various versions
-of Python are available and can be installed with e.g. ``pkgutil -i python27``.
-
-
 .. _building-python-on-unix:
 
 Building Python
 
@@ -6706,7 +6706,6 @@ type_ready_mro(PyTypeObject *type)
        and static builtin types must have static builtin bases. */
     if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) {
         assert(type->tp_flags & Py_TPFLAGS_IMMUTABLETYPE);
-        int isbuiltin = type->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN;
         PyObject *mro = type->tp_mro;
         Py_ssize_t n = PyTuple_GET_SIZE(mro);
         for (Py_ssize_t i = 0; i < n; i++) {
@@ -6718,7 +6717,8 @@ type_ready_mro(PyTypeObject *type)
                              type->tp_name, base->tp_name);
                 return -1;
             }
-            assert(!isbuiltin || (base->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN));
+            assert(!(type->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN) ||
+                   (base->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN));
         }
     }
     return 0;
Original file line number	Diff line number	Diff line change
@@ -6706,7 +6706,6 @@ type_ready_mro(PyTypeObject *type)
6706	6706	and static builtin types must have static builtin bases. */
6707	6707	if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) {
6708	6708	assert(type->tp_flags & Py_TPFLAGS_IMMUTABLETYPE);
6709		- int isbuiltin = type->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN;
6710	6709	PyObject *mro = type->tp_mro;
6711	6710	Py_ssize_t n = PyTuple_GET_SIZE(mro);
6712	6711	for (Py_ssize_t i = 0; i < n; i++) {
@@ -6718,7 +6717,8 @@ type_ready_mro(PyTypeObject *type)
6718	6717	type->tp_name, base->tp_name);
6719	6718	return -1;
6720	6719	}
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));
6722	6722	}
6723	6723	}
6724	6724	return 0;