mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-28 20:56:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

updated occurences of fqdn algorithm (closes patch #101197)

Browse source
This commit is contained in:
Peter Schneider-Kamp 2000-08-16 20:30:21 +00:00
parent 77c9f50422
commit 2d2785aad1
3 changed files with 8 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/ftplib.py
View file

@ -41,7 +41,8 @@ import string
# Import SOCKS module if it exists, else standard socket module socket
try:
import SOCKS; socket = SOCKS
import SOCKS; socket = SOCKS; del SOCKS # import SOCKS as socket
from socket import getfqdn; socket.getfqdn = getfqdn; del getfqdn
except ImportError:
import socket
@ -291,17 +292,8 @@ class FTP:
if not passwd: passwd = ''
if not acct: acct = ''
if user == 'anonymous' and passwd in ('', '-'):
thishost = socket.gethostname()
# Make sure it is fully qualified
if not '.' in thishost:
thisaddr = socket.gethostbyname(thishost)
firstname, names, unused = \
socket.gethostbyaddr(thisaddr)
names.insert(0, firstname)
for name in names:
if '.' in name:
thishost = name
break
# get fully qualified domain name of local host
thishost = socket.getfqdn()
try:
if os.environ.has_key('LOGNAME'):
realuser = os.environ['LOGNAME']