Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Avoid chained exception messages in the ICU templates

Browse Source
This commit is contained in:
Kovid Goyal 2019-04-02 15:25:09 +05:30
parent cf220e7372
commit bea653d594
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/utils/icu.py
View File

@ -130,7 +130,8 @@ def {name}(obj):
try: try:
return {collator}.{func}(obj) return {collator}.{func}(obj)
except AttributeError: except AttributeError:
return {collator_func}().{func}(obj) pass
return {collator_func}().{func}(obj)
except TypeError: except TypeError:
if isinstance(obj, bytes): if isinstance(obj, bytes):
try: try:
@ -147,7 +148,8 @@ def {name}(a, b):
try: try:
return {collator}.{func}(a, b) return {collator}.{func}(a, b)
except AttributeError: except AttributeError:
return {collator_func}().{func}(a, b) pass
return {collator_func}().{func}(a, b)
except TypeError: except TypeError:
if isinstance(a, bytes): if isinstance(a, bytes):
try: try:
@ -172,8 +174,9 @@ def {name}(x):
try: try:
return _icu.change_case(x, _icu.{which}, _locale) return _icu.change_case(x, _icu.{which}, _locale)
except NotImplementedError: except NotImplementedError:
collator() # sets _locale pass
return _icu.change_case(x, _icu.{which}, _locale) collator() # sets _locale
return _icu.change_case(x, _icu.{which}, _locale)
except TypeError: except TypeError:
if isinstance(x, bytes): if isinstance(x, bytes):
try: try: