[Python-checkins] r43500 - python/branches/release24-maint/Lib/smtplib.py

[georg.brandl]

Author: georg.brandl
Date: Fri Mar 31 21:34:17 2006
New Revision: 43500

Modified:
   python/branches/release24-maint/Lib/smtplib.py
Log:
bug #1257988: don't bail out on gethostbyname(gethostname()) failure
 (backport from rev. 43499)

Modified: python/branches/release24-maint/Lib/smtplib.py
==============================================================================
--- python/branches/release24-maint/Lib/smtplib.py	(original)
+++ python/branches/release24-maint/Lib/smtplib.py	Fri Mar 31 21:34:17 2006
@@ -255,7 +255,11 @@
                 self.local_hostname = fqdn
             else:
                 # We can't find an fqdn hostname, so use a domain literal
-                addr = socket.gethostbyname(socket.gethostname())
+                addr = '127.0.0.1'
+                try:
+                    addr = socket.gethostbyname(socket.gethostname())
+                except socket.gaierror:
+                    pass
                 self.local_hostname = '[%s]' % addr
 
     def set_debuglevel(self, debuglevel):