diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-01-13 14:20:31 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-01-13 14:20:31 (GMT) |
| commit | 610bc6a211be33b390a9910943f1f9fb7656f634 (patch) | |
| tree | 9498dd48c73ea91305805a6e1967f32becd39d70 /Lib/socket.py | |
| parent | 458fc6f98ca9a838af5dcdff64fd48ae3eb64fa9 (diff) | |
| parent | 82f34ada45f96c13eb68927d6beccdcbab2c77b3 (diff) | |
| download | cpython-610bc6a211be33b390a9910943f1f9fb7656f634.zip cpython-610bc6a211be33b390a9910943f1f9fb7656f634.tar.gz cpython-610bc6a211be33b390a9910943f1f9fb7656f634.tar.bz2 | |
merge 3.4 (#23221)
Diffstat (limited to 'Lib/socket.py')
| -rw-r--r-- | Lib/socket.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/socket.py b/Lib/socket.py index 7dc8ef0..5c26dd7 100644 --- a/Lib/socket.py +++ b/Lib/socket.py @@ -450,7 +450,7 @@ if hasattr(_socket.socket, "share"): def fromshare(info): """ fromshare(info) -> socket object - Create a socket object from a the bytes object returned by + Create a socket object from the bytes object returned by socket.share(pid). """ return socket(0, 0, 0, info) |