diff options
| author | Brett Cannon <bcannon@gmail.com> | 2005-03-12 06:15:56 (GMT) |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2005-03-12 06:15:56 (GMT) |
| commit | e3fa0611a99d101ffa459221fa3a44f4110834b5 (patch) | |
| tree | 08a200996928dc123e59d96cb86e352b88c3ce50 /Lib | |
| parent | c13c04007d9ab67c5f0dad3486469085fe35c1b2 (diff) | |
| download | cpython-e3fa0611a99d101ffa459221fa3a44f4110834b5.zip cpython-e3fa0611a99d101ffa459221fa3a44f4110834b5.tar.gz cpython-e3fa0611a99d101ffa459221fa3a44f4110834b5.tar.bz2 | |
Fix test_socket's test for socket.getfqdn() to also accept the result from
socket.gethostname() as a valid return value.
Also clarified the docs as they were a little hazy on the subject matter.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/socket.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_socket.py | 2 |
2 files changed, 2 insertions, 2 deletions
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.") |