From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 6 Jun 2014 16:17:05 +0000 (+0600)
Subject: Fixed a Python 3 regression.
X-Git-Tag: 2.8~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b32f8f8d1c2970a83ce8565a6e0d581a4187ded;p=thirdparty%2Fjinja.git

Fixed a Python 3 regression.
---

diff --git a/jinja2/runtime.py b/jinja2/runtime.py
index 937e8674..792fb9a6 100644
--- a/jinja2/runtime.py
+++ b/jinja2/runtime.py
@@ -521,6 +521,7 @@ class Undefined(object):
 
     def __nonzero__(self):
         return False
+    __bool__ = __nonzero__
 
     def __repr__(self):
         return 'Undefined'
@@ -583,21 +584,26 @@ def make_logging_undefined(logger=None, base=None):
             _log_message(self)
             return rv
 
-        if PY2:
-            def __unicode__(self):
-                rv = base.__unicode__(self)
-                _log_message(self)
-                return rv
-
         def __iter__(self):
             rv = base.__iter__(self)
             _log_message(self)
             return rv
 
-        def __nonzero__(self):
-            rv = base.__nonzero__(self)
-            _log_message(self)
-            return rv
+        if PY2:
+            def __nonzero__(self):
+                rv = base.__nonzero__(self)
+                _log_message(self)
+                return rv
+
+            def __unicode__(self):
+                rv = base.__unicode__(self)
+                _log_message(self)
+                return rv
+        else:
+            def __bool__(self):
+                rv = base.__bool__(self)
+                _log_message(self)
+                return rv
 
     return LoggingUndefined