Pairprogramming with Matthijs

Author: bartvaneswhiffle

docs/source/api.rst

@@ -162,9 +162,6 @@ Built-in Implementations
 .. autoclass:: fsspec.implementations.ftp.FTPFileSystem
    :members: __init__
 
-.. autoclass:: fsspec.implementations.ftp.FTPTLSFileSystem
-   :members: __init__
-
 .. autoclass:: fsspec.implementations.git.GitFileSystem
    :members: __init__
 

fsspec/implementations/ftp.py

@@ -27,8 +27,7 @@ def __init__(
         tempdir=None,
         timeout=30,
         encoding="utf-8",
-        ssl=False,
-        prot_p=False,
+        tls=False,
         **kwargs,
     ):
         """
@@ -58,26 +57,28 @@ def __init__(
             Timeout of the ftp connection in seconds
         encoding: str
             Encoding to use for directories and filenames in FTP connection
+        tls: bool
+            Use FTP-TLS, by default False
         """
         super().__init__(**kwargs)
         self.host = host
         self.port = port
         self.tempdir = tempdir or "/tmp"
-        self.cred = username, password, acct
+        self.cred = username or "", password or "", acct or ""
+        print(self.cred)
         self.timeout = timeout
         self.encoding = encoding
         if block_size is not None:
             self.blocksize = block_size
         else:
             self.blocksize = 2**16
-        self.ssl = ssl
-        self.prot_p = prot_p
+        self.tls = tls
         self._connect()
-        if self.prot_p:
+        if self.tls:
             self.ftp.prot_p()
 
     def _connect(self):
-        if self.ssl:
+        if self.tls:
             ftp_cls = FTP_TLS
         else:
             ftp_cls = FTP

fsspec/implementations/tests/test_ftp.py

@@ -2,6 +2,7 @@
 import subprocess
 import sys
 import time
+from ftplib import FTP, FTP_TLS
 
 import pytest
 
@@ -29,6 +30,19 @@ def ftp():
         P.wait()
 
 
+@pytest.mark.parametrize(
+    "tls,exp_cls",
+    (
+        (False, FTP),
+        (True, FTP_TLS),
+    ),
+)
+def test_tls(ftp, tls, exp_cls):
+    host, port = ftp
+    fs = FTPFileSystem(host, port, tls=tls)
+    assert isinstance(fs.ftp, exp_cls)
+
+
 def test_basic(ftp):
     host, port = ftp
     fs = FTPFileSystem(host, port)