diff options
| -rw-r--r-- | Doc/lib/libsocket.tex | 4 | ||||
| -rw-r--r-- | Lib/socket.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_socket.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 8 |
4 files changed, 12 insertions, 4 deletions
diff --git a/Doc/lib/libsocket.tex b/Doc/lib/libsocket.tex index db0b767..1f5bcaa 100644 --- a/Doc/lib/libsocket.tex +++ b/Doc/lib/libsocket.tex @@ -202,8 +202,8 @@ If \var{name} is omitted or empty, it is interpreted as the local host. To find the fully qualified name, the hostname returned by \function{gethostbyaddr()} is checked, then aliases for the host, if available. The first name which includes a period is selected. In -case no fully qualified domain name is available, the hostname is -returned. +case no fully qualified domain name is available, the hostname as +returned by \function{gethostname()} is returned. \versionadded{2.0} \end{funcdesc} diff --git a/Lib/socket.py b/Lib/socket.py index f96a146..5fd51f4 100644 --- a/Lib/socket.py +++ b/Lib/socket.py @@ -102,7 +102,7 @@ def getfqdn(name=''): First the hostname returned by gethostbyaddr() is checked, then possibly existing aliases. In case no FQDN is available, hostname - is returned. + as returned by gethostname() is returned. """ name = name.strip() if not name or name == '0.0.0.0': diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index e6cdb8b..bf2ecae 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -267,7 +267,7 @@ class GeneralModuleTests(unittest.TestCase): except socket.error: # Probably a similar problem as above; skip this test return - all_host_names = [hname] + aliases + all_host_names = [hostname, hname] + aliases fqhn = socket.getfqdn() if not fqhn in all_host_names: self.fail("Error testing host resolution mechanisms.") @@ -22,6 +22,14 @@ Library #1110478: revert os.environ.update to do putenv again). +Tests +----- + +- Fix the test for socket.getfqdn() in test_socket to also consider the host + name returned by socket.gethostname() a valid return value for getfqdn(). + Also clarified the wording of docs and docstring that this is the case. + + What's New in Python 2.4.1c1? ============================= |