gh-127478: Enhancement to support FTP connection with NAT scenario

Lib/ftplib.py

@@ -324,7 +324,10 @@ def makeport(self):
     def makepasv(self):
         """Internal: Does the PASV or EPSV handshake -> (address, port)"""
         if self.af == socket.AF_INET:
-            untrusted_host, port = parse227(self.sendcmd('PASV'))
+            try:
+                untrusted_host, port = parse227(self.sendcmd('PASV'))
+            except error_reply:
+                untrusted_host, port = parse229(self.sendcmd('EPSV'), self.sock.getpeername())
             if self.trust_server_pasv_ipv4_address:
                 host = untrusted_host
             else:

Misc/NEWS.d/next/Library/2024-12-01-16-43-38.gh-issue-127478.fHI_y9.rst

@@ -0,0 +1 @@
+Enhancement to support FTP connection with NAT scenario.