From 0a0364e9f8aa1ab952307011d23ae28bad273c2d Mon Sep 17 00:00:00 2001 From: ed Date: Mon, 28 Aug 2023 00:25:33 +0000 Subject: [PATCH] FTPd: fix py3.12 support; workaround until next release: run sfx twice with PYTHONPATH=/tmp/pe-copyparty.$(id -u)/copyparty/vend --- copyparty/ftpd.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/copyparty/ftpd.py b/copyparty/ftpd.py index d5ae8ea9..d691c8fc 100644 --- a/copyparty/ftpd.py +++ b/copyparty/ftpd.py @@ -9,12 +9,19 @@ import stat import sys import time +from .__init__ import ANYWIN, PY2, TYPE_CHECKING, E + +try: + import asynchat +except: + sys.path.append(os.path.join(E.mod, "vend")) + from pyftpdlib.authorizers import AuthenticationFailed, DummyAuthorizer from pyftpdlib.filesystems import AbstractedFS, FilesystemError from pyftpdlib.handlers import FTPHandler +from pyftpdlib.ioloop import IOLoop from pyftpdlib.servers import FTPServer -from .__init__ import ANYWIN, PY2, TYPE_CHECKING, E from .authsrv import VFS from .bos import bos from .util import ( @@ -30,15 +37,6 @@ from .util import ( vjoin, ) -try: - from pyftpdlib.ioloop import IOLoop -except ImportError: - p = os.path.join(E.mod, "vend") - print("loading asynchat from " + p) - sys.path.append(p) - from pyftpdlib.ioloop import IOLoop - - if TYPE_CHECKING: from .svchub import SvcHub