Fix Python 3 "TypeError: decoding str is not supported" in FtpUrl.cwd

cjmayo · cjmayo · commit 72b85c4e2d74 · 2019-04-22T19:28:26.000+01:00
diff --git a/linkcheck/checker/ftpurl.py b/linkcheck/checker/ftpurl.py
@@ -25,6 +25,8 @@
     # Python 3
     from io import StringIO
 
+from builtins import bytes
+
 from .. import log, LOG_CHECK, LinkCheckerError, mimeutil
 from . import proxysupport, httpurl, internpaturl, get_index_html
 from .const import WARN_FTP_MISSING_SLASH
@@ -116,7 +118,9 @@ def cwd (self):
         Change to URL parent directory. Return filename of last path
         component.
         """
-        path = self.urlparts[2].encode(self.filename_encoding, 'replace')
+        path = self.urlparts[2]
+        if isinstance(path, bytes):
+            path = path.decode(self.filename_encoding, 'replace')
         dirname = path.strip('/')
         dirs = dirname.split('/')
         filename = dirs.pop()
