Decode bytes to a string for ftplib.parse150() (RhBug:1734527)

ftplib.parse150() expects a string, we need to decode the bytes before
passing them to the function in Python 3.

https://bugzilla.redhat.com/show_bug.cgi?id=1734527

1 files changed, 9 insertions, 1 deletions

diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
index b72d089..d443548 100644
--- a/urlgrabber/grabber.py
+++ b/urlgrabber/grabber.py
@@ -720,6 +720,14 @@ def exception2msg(e):
         # always use byte strings
         return text_type(e).encode('utf8')
 
+def bytes_to_string(b):
+    if sys.version_info < (3,):
+        # in python 2 strings are bytes
+        return b
+    else:
+        # python 3, will ignore any non-ascii characters if the encoding isn't utf8
+        return b.decode('utf8', 'ignore')
+
 ########################################################################
 #                 END UTILITY FUNCTIONS
 ########################################################################
@@ -1425,7 +1433,7 @@ class PyCurlFileObject(object):
                     if len(s) >= 14:
                         s = None # ignore MDTM responses
                 elif buf.startswith(b'150 '):
-                    s = parse150(buf)
+                    s = parse150(bytes_to_string(buf))
                 if s:
                     self.size = int(s)