mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-18 09:22:31 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

minimal py2 support for ftpd

Browse source
This commit is contained in:
ed 2022-03-03 01:18:01 +01:00
parent 32e22dfe84
commit 8b2c7586ce
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
copyparty/ftpd.py
View file

@ -7,9 +7,8 @@ import stat
import time import time
import logging import logging
import threading import threading
from typing import TYPE_CHECKING
from .__init__ import E from .__init__ import E, PY2
from .util import Pebkac, fsenc, exclude_dotfiles from .util import Pebkac, fsenc, exclude_dotfiles
from .bos import bos from .bos import bos
@ -28,8 +27,13 @@ from pyftpdlib.servers import FTPServer
from pyftpdlib.log import config_logging from pyftpdlib.log import config_logging
if TYPE_CHECKING: try:
from typing import TYPE_CHECKING
if TYPE_CHECKING:
from .svchub import SvcHub from .svchub import SvcHub
except ImportError:
pass
class FtpAuth(DummyAuthorizer): class FtpAuth(DummyAuthorizer):
@ -257,6 +261,9 @@ class FtpHandler(FTPHandler):
abstracted_fs = FtpFs abstracted_fs = FtpFs
def __init__(self, conn, server, ioloop=None): def __init__(self, conn, server, ioloop=None):
if PY2:
FTPHandler.__init__(self, conn, server, ioloop)
else:
super(FtpHandler, self).__init__(conn, server, ioloop) super(FtpHandler, self).__init__(conn, server, ioloop)
# abspath->vpath mapping to resolve log_transfer paths # abspath->vpath mapping to resolve log_transfer paths