From f53fdebabdcf9d92b5e08e15661322ebe050d53b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 6 Jul 2017 19:59:35 +0530 Subject: [PATCH] Micro-optimization --- src/calibre/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py index dbebce117f..d96f48f9a5 100644 --- a/src/calibre/__init__.py +++ b/src/calibre/__init__.py @@ -638,21 +638,21 @@ def prepare_string_for_xml(raw, attribute=False): def isbytestring(obj): - return isinstance(obj, (str, bytes)) + return isinstance(obj, bytes) def force_unicode(obj, enc=preferred_encoding): if isbytestring(obj): try: obj = obj.decode(enc) - except: + except Exception: try: obj = obj.decode(filesystem_encoding if enc == preferred_encoding else preferred_encoding) - except: + except Exception: try: obj = obj.decode('utf-8') - except: + except Exception: obj = repr(obj) if isbytestring(obj): obj = obj.decode('utf-8')