Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
number of tests, all because of the codecs/_multibytecodecs issue described
here (it's not a Py3K issue, just something Py3K discovers):
http://mail.python.org/pipermail/python-dev/2006-April/064051.html
Hye-Shik Chang promised to look for a fix, so no need to fix it here. The
tests that are expected to break are:
test_codecencodings_cn
test_codecencodings_hk
test_codecencodings_jp
test_codecencodings_kr
test_codecencodings_tw
test_codecs
test_multibytecodec
This merge fixes an actual test failure (test_weakref) in this branch,
though, so I believe merging is the right thing to do anyway.
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 @@
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: