From a71f2de211f533c04319e5ccace0c19f073a162d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 18 Dec 2020 08:13:04 +0530
Subject: [PATCH] String changes

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

diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py
index 2e1844629e..18574cfe04 100644
--- a/src/calibre/utils/formatter.py
+++ b/src/calibre/utils/formatter.py
@@ -138,16 +138,15 @@ class _Parser(object):
     def error(self, message):
         try:
             tval = "'" + self.prog[self.lex_pos-1][1] + "'"
-        except:
+        except Exception:
             tval = _('Unknown')
-        m = 'Formatter: ' + message + _(' near')
         if self.lex_pos > 0:
-            m = '{0} {1}'.format(m, tval)
+            location = tval
         elif self.lex_pos < self.prog_len:
-            m = '{0} {1}'.format(m, tval)
+            location = tval
         else:
-            m = '{0} {1}'.format(m, _('end of program'))
-        raise ValueError(m)
+            location = _('the end of the program')
+        raise ValueError(_('{0}: {1} near {2}').format('Formatter', message, location))
 
     def token(self):
         try: