From 25905a349c745108abd6290d5835b109359a72de Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Fri, 24 Sep 2010 13:20:26 +0100
Subject: [PATCH] Test the 'test' function. Add 're' function and test it.

---
 src/calibre/utils/formatter.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py
index 5c5893576c..c6bcaa1c3e 100644
--- a/src/calibre/utils/formatter.py
+++ b/src/calibre/utils/formatter.py
@@ -43,6 +43,9 @@ class TemplateFormatter(string.Formatter):
         else:
             return val
 
+    def _re(self, val, pattern, replacement):
+        return re.sub(pattern, replacement, val)
+
     functions = {
                     'uppercase'     : (0, lambda s,x: x.upper()),
                     'lowercase'     : (0, lambda s,x: x.lower()),
@@ -50,8 +53,9 @@ class TemplateFormatter(string.Formatter):
                     'capitalize'    : (0, lambda s,x: x.capitalize()),
                     'ifempty'       : (1, _ifempty),
                     'lookup'        : (2, _lookup),
+                    're'            : (2, _re),
                     'shorten'       : (3, _shorten),
-                    'test'          : (2, _lookup),
+                    'test'          : (2, _test),
         }
 
     format_string_re = re.compile(r'^(.*)\|(.*)\|(.*)$')