From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 17 Oct 2010 14:47:06 +0000 (+0200)
Subject: Finally fixed the 64bit segfault on big-endian architectures in non-tracing mode
X-Git-Tag: 2.5.4~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=da8d68f1f9a6b0f70e493d706784ef9541857608;p=jinja2.git

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

diff --git a/CHANGES b/CHANGES
index d07be9e..893bc57 100644
--- 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 35ae24f..eb15456 100644
--- 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_ = [