Fix ½ifdefempty{}

test/test_functions.py

@@ -213,6 +213,7 @@ def setUp(self):
             'false': False,
             'non_empty_string': u'test',
             'none': None,
+            'only_whitespaces': u' \t\n',
         }
 
     def parseEqual(self, a, b):
@@ -231,14 +232,19 @@ def test_non_empty_string(self):
         self.parseEqual(u'%ifdefempty{non_empty_string,trueval,falseval}',
                         u'falseval')
 
+    # nonexistent
+    def test_nonexistent(self):
+        self.parseEqual(u'%ifdefempty{nonexistent,trueval,falseval}',
+                        u'trueval')
+
     # none
     def test_none(self):
         self.parseEqual(u'%ifdefempty{none,trueval}', u'trueval')
 
     # nonexistent
-    def test_nonexistent(self):
-        self.parseEqual(u'%ifdefempty{nonexistent,trueval,falseval}',
-                        u'falseval')
+    def test_only_whitespaces(self):
+        self.parseEqual(u'%ifdefempty{only_whitespaces,trueval,falseval}',
+                        u'trueval')
 
 
 if __name__ == '__main__':

tmep/func.py

@@ -18,6 +18,7 @@
 from __future__ import division, absolute_import, print_function
 
 import time
+import re
 import textwrap
 from unidecode import unidecode
 
@@ -170,7 +171,9 @@ def tmpl_ifdefempty(self, field, trueval=u'', falseval=u''):
         :param falseval: The string if the condition is false
         :return: The string, based on condition
         """
-        if field in self.values and not self.values[field]:
+        if not field in self.values or \
+           (field in self.values and not self.values[field]) or \
+           re.search(r'^\s*$', self.values[field]):
             return trueval
         else:
             return falseval