From ac14585a78448681cc232994a82ea640c9016a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Dlouh=C3=BD?= Date: Sat, 6 Jan 2018 14:36:49 +0100 Subject: [PATCH] Python3: fix strformat for test_file --- linkcheck/strformat.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linkcheck/strformat.py b/linkcheck/strformat.py index bf0177d5..ab37fe00 100644 --- a/linkcheck/strformat.py +++ b/linkcheck/strformat.py @@ -61,10 +61,10 @@ def unicode_safe (s, encoding=i18n.default_encoding, errors='replace'): return s try: - ret_str = unicode(str(s), encoding, errors) - except NameError: - ret_str = s - return ret_str + return unicode(str(s), encoding, errors) + except NameError: # Python3 + if isinstance(s, bytes): + return s.decode("utf-8", errors) def ascii_safe (s):