X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rurllib_py3.py;h=ae88b1956f54e5f894f9ae2c584258408e5cfa9b;hb=2b3829aef193cb1951989a8cf97a96dcbfc084a1;hp=1daec389aebaa27f3eb502cc2ef2016310dbea4c;hpb=f84406ac3fd5b69919ff801e1db82a56a7186a10;p=bookmarks_db.git diff --git a/Robots/bkmk_rurllib_py3.py b/Robots/bkmk_rurllib_py3.py index 1daec38..ae88b19 100644 --- a/Robots/bkmk_rurllib_py3.py +++ b/Robots/bkmk_rurllib_py3.py @@ -117,21 +117,19 @@ class robot_urllib_py3(robot_base): ): if encoding and encoding not in possible_encodings: possible_encodings.append(encoding) - content = None - for encoding in possible_encodings: - infile = open(fname, 'rt', encoding=encoding) - try: - content = infile.read() - except UnicodeDecodeError: - infile.close() - continue - else: - break + content = e = None + infile = open(fname, 'rb') + try: + content = infile.read() + except Exception: + content = None + finally: infile.close() if content is None: + e = str(e) return ( - 'ERROR: File encoding was not recognized', + 'ERROR: ' + e, None, None, None, None ) return None, None, None, headers, content