traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Always use 'anonymous' if os.environ doesn't exist

This commit is contained in:
Jack Jansen 1995-01-19 12:24:45 +00:00
parent c39f4f8968
commit 40b9835e98
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/ftplib.py
View File

@ -2,6 +2,7 @@
# (FTP), by J. Postel and J. Reynolds # (FTP), by J. Postel and J. Reynolds
# Changes and improvements suggested by Steve Majewski # Changes and improvements suggested by Steve Majewski
# Modified by Jack to work on the mac.
# Example: # Example:
@ -220,11 +221,15 @@ class FTP:
if not user: user = 'anonymous' if not user: user = 'anonymous'
if user == 'anonymous' and passwd in ('', '-'): if user == 'anonymous' and passwd in ('', '-'):
thishost = socket.gethostname() thishost = socket.gethostname()
if os.environ.has_key('LOGNAME'): try:
realuser = os.environ['LOGNAME'] if os.environ.has_key('LOGNAME'):
elif os.environ.has_key('USER'): realuser = os.environ['LOGNAME']
realuser = os.environ['USER'] elif os.environ.has_key('USER'):
else: realuser = os.environ['USER']
else:
realuser = 'anonymous'
except AttributeError:
# Not all systems have os.environ....
realuser = 'anonymous' realuser = 'anonymous'
passwd = passwd + realuser + '@' + thishost passwd = passwd + realuser + '@' + thishost
resp = self.sendcmd('USER ' + user) resp = self.sendcmd('USER ' + user)