summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Ronacher <armin.ronacher@active-4.com>2010-10-17 16:47:06 +0200
committerArmin Ronacher <armin.ronacher@active-4.com>2010-10-17 16:47:06 +0200
commitda8d68f1f9a6b0f70e493d706784ef9541857608 (patch)
tree3a4fb655476f9ae38c9c576aa0faf2d404f85bf7
parent7b93e7ef53e5008bcb2caf6405f08e863c244789 (diff)
downloadjinja2-da8d68f1f9a6b0f70e493d706784ef9541857608.tar.gz
Finally fixed the 64bit segfault on big-endian architectures in non-tracing mode
-rw-r--r--CHANGES2
-rw-r--r--jinja2/debug.py2
2 files changed, 3 insertions, 1 deletions
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_ = [