Merge branch '2.11.x'

3 files changed, 10 insertions, 12 deletions

diff --git a/src/jinja2/debug.py b/src/jinja2/debug.py
index 46c24eba..5cac28ba 100644
--- a/src/jinja2/debug.py
+++ b/src/jinja2/debug.py
@@ -238,10 +238,7 @@ else:
     class _CTraceback(ctypes.Structure):
         _fields_ = [
             # Extra PyObject slots when compiled with Py_TRACE_REFS.
-            (
-                "PyObject_HEAD",
-                ctypes.c_byte * (32 if hasattr(sys, "getobjects") else 16),
-            ),
+            ("PyObject_HEAD", ctypes.c_byte * object().__sizeof__()),
             # Only care about tb_next as an object, not a traceback.
             ("tb_next", ctypes.py_object),
         ]
diff --git a/src/jinja2/loaders.py b/src/jinja2/loaders.py
index b02cc357..d5c45c49 100644
--- a/src/jinja2/loaders.py
+++ b/src/jinja2/loaders.py
@@ -232,10 +232,10 @@ class PackageLoader(BaseLoader):
     contributor. Zip files contributing to a namespace are not
     supported.
 
-    .. versionchanged:: 2.11.0
+    .. versionchanged:: 3.0
         No longer uses ``setuptools`` as a dependency.
 
-    .. versionchanged:: 2.11.0
+    .. versionchanged:: 3.0
         Limited PEP 420 namespace package support.
     """
 
diff --git a/src/jinja2/utils.py b/src/jinja2/utils.py
index 99293cd6..b373950e 100644
--- a/src/jinja2/utils.py
+++ b/src/jinja2/utils.py
@@ -158,12 +158,13 @@ def object_type_repr(obj):
         return "None"
     elif obj is Ellipsis:
         return "Ellipsis"
-    # __builtin__ in 2.x, builtins in 3.x
-    if obj.__class__.__module__ in ("__builtin__", "builtins"):
-        name = obj.__class__.__name__
-    else:
-        name = f"{obj.__class__.__module__}.{obj.__class__.__name__}"
-    return f"{name} object"
+
+    cls = type(obj)
+
+    if cls.__module__ == "builtins":
+        return f"{cls.__name__} object"
+
+    return f"{cls.__module__}.{cls.__name__} object"
 
 
 def pformat(obj):