summaryrefslogtreecommitdiff
path: root/Lib/socket.py
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2005-03-11 00:04:17 +0000
committerBrett Cannon <bcannon@gmail.com>2005-03-11 00:04:17 +0000
commit01668a1ab93baacd3c68f8b0b3b0ca6d43f0f444 (patch)
tree62d596a9ce52ca561ab06516a8c293c2cc7095c0 /Lib/socket.py
parent94d6201eb066fc769786f0c52ffc859fc6169d50 (diff)
downloadcpython-git-01668a1ab93baacd3c68f8b0b3b0ca6d43f0f444.tar.gz
Fix test for socket.getfqdn() to also include the name returned by
socket.gethostname() in the check for a valid return. Also clarified docs (official and docstring) that the value from gethostname() is returned if gethostbyaddr() doesn't do the job.
Diffstat (limited to 'Lib/socket.py')
-rw-r--r--Lib/socket.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/socket.py b/Lib/socket.py
index f96a146837..ee2457fa0c 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.
+ from gethostname() is returned.
"""
name = name.strip()
if not name or name == '0.0.0.0':