diff options
| -rw-r--r-- | Lib/mimetools.py | 5 | ||||
| -rw-r--r-- | Lib/test/test_urllib2.py | 14 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 17 insertions, 5 deletions
diff --git a/Lib/mimetools.py b/Lib/mimetools.py index 0b698ac..8c1cc19 100644 --- a/Lib/mimetools.py +++ b/Lib/mimetools.py @@ -127,7 +127,10 @@ def choose_boundary(): import time if _prefix is None: import socket - hostid = socket.gethostbyname(socket.gethostname()) + try: + hostid = socket.gethostbyname(socket.gethostname()) + except socket.gaierror: + hostid = '127.0.0.1' try: uid = repr(os.getuid()) except AttributeError: diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index 5710444..7e0bbf0 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -349,13 +349,19 @@ class HandlerTests(unittest.TestCase): TESTFN = test_support.TESTFN urlpath = sanepathname2url(os.path.abspath(TESTFN)) towrite = "hello, world\n" - for url in [ + urls = [ "file://localhost%s" % urlpath, "file://%s" % urlpath, "file://%s%s" % (socket.gethostbyname('localhost'), urlpath), - "file://%s%s" % (socket.gethostbyname(socket.gethostname()), - urlpath), - ]: + ] + try: + localaddr = socket.gethostbyname(socket.gethostname()) + except socket.gaierror: + localaddr = '' + if localaddr: + urls.append("file://%s%s" % (localaddr, urlpath)) + + for url in urls: f = open(TESTFN, "wb") try: try: @@ -485,6 +485,9 @@ Extension Modules Library ------- +- Bug #1250170: mimetools now gracefully handles socket.gethostname() + failures gracefully. + - patch #1457316: "setup.py upload" now supports --identity to select the key to be used for signing the uploaded code. |