From 69ee2b59e48f47080f5f15a9e602452fd59c4ce2 Mon Sep 17 00:00:00 2001 From: Samuel Loury Date: Thu, 11 Feb 2016 12:29:39 +0100 Subject: [PATCH] Use the last API of pyftpdlib --- fs/expose/ftp.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/expose/ftp.py b/fs/expose/ftp.py index 6dbfc92..667831a 100644 --- a/fs/expose/ftp.py +++ b/fs/expose/ftp.py @@ -21,7 +21,7 @@ import errno from functools import wraps -from pyftpdlib import ftpserver +from pyftpdlib import filesystems, servers, handlers from fs.path import * from fs.osfs import OSFS @@ -70,7 +70,7 @@ def __init__(self, **kwargs): setattr(self, attr, value) -class FTPFS(ftpserver.AbstractedFS): +class FTPFS(filesystems.AbstractedFS): """ The basic FTP Filesystem. This is a bridge between a pyfs filesystem and pyftpdlib's AbstractedFS. This class will cause the FTP server to serve the given fs instance. @@ -232,7 +232,7 @@ def lexists(self, path): return True -class FTPFSHandler(ftpserver.FTPHandler): +class FTPFSHandler(handlers.FTPHandler): """ An FTPHandler class that closes the filesystem when done. """ @@ -283,10 +283,10 @@ def serve_fs(fs, addr, port): Creates a basic anonymous FTP server serving the given FS on the given address/port combo. """ - from pyftpdlib.contrib.authorizers import UnixAuthorizer + from pyftpdlib.authorizers import UnixAuthorizer ftp_handler = FTPFSHandler - ftp_handler.authorizer = ftpserver.DummyAuthorizer() + ftp_handler.authorizer = handlers.DummyAuthorizer() ftp_handler.authorizer.add_anonymous('/') ftp_handler.abstracted_fs = FTPFSFactory(fs) - s = ftpserver.FTPServer((addr, port), ftp_handler) + s = servers.FTPServer((addr, port), ftp_handler) s.serve_forever()