Permalink
Browse files

Merge branch '2.5-maintenance'

  • Loading branch information...
2 parents 44e1f56 + da8d68f commit cff8e1cd5d325d175449476e1fad433e24ff6479 @mitsuhiko mitsuhiko committed Oct 17, 2010
Showing with 6 additions and 2 deletions.
  1. +4 −0 CHANGES
  2. +1 −1 jinja2/debug.py
  3. +1 −1 jinja2/environment.py
View
4 CHANGES
@@ -9,6 +9,10 @@ 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
-------------
(bugfix release, released on October 17th 2010)
View
2 jinja2/debug.py
@@ -259,7 +259,7 @@ class _PyObject(ctypes.Structure):
]
# python with trace
- if object.__basicsize__ != ctypes.sizeof(_PyObject):
+ if hasattr(sys, 'getobjects'):
class _PyObject(ctypes.Structure):
pass
_PyObject._fields_ = [
View
2 jinja2/environment.py
@@ -335,7 +335,7 @@ def overlay(self, block_start_string=missing, block_end_string=missing,
for key, value in self.extensions.iteritems():
rv.extensions[key] = value.bind(rv)
if extensions is not missing:
- rv.extensions.update(load_extensions(extensions))
+ rv.extensions.update(load_extensions(rv, extensions))
return _environment_sanity_check(rv)

0 comments on commit cff8e1c

Please sign in to comment.