From bea653d5947c4301f8f91c48bc748edf6ef39ef9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 2 Apr 2019 15:25:09 +0530
Subject: [PATCH] Avoid chained exception messages in the ICU templates

---
 src/calibre/utils/icu.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/calibre/utils/icu.py b/src/calibre/utils/icu.py
index 278fe26131..7290a921b8 100644
--- a/src/calibre/utils/icu.py
+++ b/src/calibre/utils/icu.py
@@ -130,7 +130,8 @@ def {name}(obj):
         try:
             return {collator}.{func}(obj)
         except AttributeError:
-            return {collator_func}().{func}(obj)
+            pass
+        return {collator_func}().{func}(obj)
     except TypeError:
         if isinstance(obj, bytes):
             try:
@@ -147,7 +148,8 @@ def {name}(a, b):
         try:
             return {collator}.{func}(a, b)
         except AttributeError:
-            return {collator_func}().{func}(a, b)
+            pass
+        return {collator_func}().{func}(a, b)
     except TypeError:
         if isinstance(a, bytes):
             try:
@@ -172,8 +174,9 @@ def {name}(x):
         try:
             return _icu.change_case(x, _icu.{which}, _locale)
         except NotImplementedError:
-            collator()  # sets _locale
-            return _icu.change_case(x, _icu.{which}, _locale)
+            pass
+        collator()  # sets _locale
+        return _icu.change_case(x, _icu.{which}, _locale)
     except TypeError:
         if isinstance(x, bytes):
             try: