From 40b9835e98e9e380cfa6eb76802567c97a82f0d8 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Thu, 19 Jan 1995 12:24:45 +0000
Subject: [PATCH] Always use 'anonymous' if os.environ doesn't exist

---
 Lib/ftplib.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

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