Finally fixed the 64bit segfault on big-endian architectures in non-tracing mode

diff --git a/CHANGES b/CHANGES
index d07be9e372765b7fc67ebd84f298d99f0f5db6d8..893bc57a4be3fff16444e16cbfda6e1877a94f16 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@ Version 2.5.4
 (bugfix release, release date to be announced)
 
 - Fixed extensions not loading properly with overlays.
+- Work around a bug in cpython for the debugger that causes segfaults
+  on 64bit big-endian architectures.
 
 Version 2.5.3
 -------------

diff --git a/jinja2/debug.py b/jinja2/debug.py
index 35ae24f57862ae4e990707319bae3320b74306e0..eb15456d13e0f743fc9477fafeccf70b36ae234f 100644 (file)
--- a/jinja2/debug.py
+++ b/jinja2/debug.py
@@ -259,7 +259,7 @@ def _init_ugly_crap():
     ]
 
     # python with trace
-    if object.__basicsize__ != ctypes.sizeof(_PyObject):
+    if hasattr(sys, 'getobjects'):
         class _PyObject(ctypes.Structure):
             pass
         _PyObject._fields_ = [