annotate Lib/socket.py @ 44685:e511ccf2ffbe legacy-trunk

Tighten the definition of a named tuple.
author Raymond Hettinger <python@rcn.com>
date Tue, 15 Jan 2008 03:07:42 +0000
parents 73bc002252bf
children 4eb5a667c882
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
1 # Wrapper module for _socket, providing some additional facilities
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
2 # implemented in Python.
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
3
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
4 """\
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
5 This module provides socket operations and some related functions.
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
6 On Unix, it supports IP (Internet Protocol) and Unix domain sockets.
15872
3685ef2a55a4 Whitespace normalization.
Tim Peters <tim.peters@gmail.com>
parents: 14935
diff changeset
7 On other systems, it only supports IP. Functions specific for a
14935
13488539f02b Mention in the module's doc string that other functions of the socket API
Martin v. Löwis <martin@v.loewis.de>
parents: 14682
diff changeset
8 socket are available as methods of the socket object.
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
9
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
10 Functions:
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
11
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
12 socket() -- create a new socket object
33063
90da70986407 Patch #1003700: Add socketpair function to socket module.
Dave Cole <djc@object-craft.com.au>
parents: 32160
diff changeset
13 socketpair() -- create a pair of new socket objects [*]
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
14 fromfd() -- create a socket object from an open file descriptor [*]
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
15 gethostname() -- return the current hostname
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
16 gethostbyname() -- map a hostname to its IP number
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
17 gethostbyaddr() -- map an IP number or hostname to DNS info
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
18 getservbyname() -- map a service name and a protocol name to a port number
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
19 getprotobyname() -- mape a protocol name (e.g. 'tcp') to a number
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
20 ntohs(), ntohl() -- convert 16, 32 bit int from network to host byte order
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
21 htons(), htonl() -- convert 16, 32 bit int from host to network byte order
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
22 inet_aton() -- convert IP addr string (123.45.67.89) to 32-bit packed format
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
23 inet_ntoa() -- convert 32-bit packed format IP to string (123.45.67.89)
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
24 ssl() -- secure socket layer support (only available if configured)
24293
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and
Guido van Rossum <guido@python.org>
parents: 23844
diff changeset
25 socket.getdefaulttimeout() -- get the default timeout value
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and
Guido van Rossum <guido@python.org>
parents: 23844
diff changeset
26 socket.setdefaulttimeout() -- set the default timeout value
41532
4b9fa8092e82 Whitespace normalization. Ugh, we really need to do this more often.
Neal Norwitz <nnorwitz@gmail.com>
parents: 41288
diff changeset
27 create_connection() -- connects to an address, with an optional timeout
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
28
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
29 [*] not available on all platforms!
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
30
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
31 Special objects:
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
32
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
33 SocketType -- type object for socket objects
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
34 error -- exception raised for I/O errors
28818
57e61588571b Patch by Jp Calderone:
Guido van Rossum <guido@python.org>
parents: 28443
diff changeset
35 has_ipv6 -- boolean value indicating if IPv6 is supported
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
36
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
37 Integer constants:
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
38
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
39 AF_INET, AF_UNIX -- socket domains (first argument to socket() call)
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
40 SOCK_STREAM, SOCK_DGRAM, SOCK_RAW -- socket types (second argument)
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
41
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
42 Many other constants may be defined; these may be used in calls to
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
43 the setsockopt() and getsockopt() methods.
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
44 """
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
45
21971
fce7278d46b0 Repair so that importing socket doesn't blow up on platforms that lack
Tim Peters <tim.peters@gmail.com>
parents: 21962
diff changeset
46 import _socket
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
47 from _socket import *
21971
fce7278d46b0 Repair so that importing socket doesn't blow up on platforms that lack
Tim Peters <tim.peters@gmail.com>
parents: 21962
diff changeset
48
21959
3957d155f8c5 Break SSL support out of _socket module and place it into a new
Marc-André Lemburg <mal@egenix.com>
parents: 21473
diff changeset
49 try:
24663
b265e76bab88 Extend __all__ with the exports list of the _ssl module.
Guido van Rossum <guido@python.org>
parents: 24662
diff changeset
50 import _ssl
21959
3957d155f8c5 Break SSL support out of _socket module and place it into a new
Marc-André Lemburg <mal@egenix.com>
parents: 21473
diff changeset
51 except ImportError:
43008
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
52 # no SSL support
24661
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
53 pass
43008
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
54 else:
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
55 def ssl(sock, keyfile=None, certfile=None):
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
56 # we do an internal import here because the ssl
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
57 # module imports the socket module
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
58 import ssl as _realssl
43325
193020bf52dc More work on SSL support.
Bill Janssen <janssen@parc.com>
parents: 43008
diff changeset
59 warnings.warn("socket.ssl() is deprecated. Use ssl.wrap_socket() instead.",
43008
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
60 DeprecationWarning, stacklevel=2)
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
61 return _realssl.sslwrap_simple(sock, keyfile, certfile)
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
62
43008
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
63 # we need to import the same constants we used to...
43325
193020bf52dc More work on SSL support.
Bill Janssen <janssen@parc.com>
parents: 43008
diff changeset
64 from _ssl import SSLError as sslerror
43008
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
65 from _ssl import \
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
66 RAND_add, \
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
67 RAND_egd, \
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
68 RAND_status, \
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
69 SSL_ERROR_ZERO_RETURN, \
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
70 SSL_ERROR_WANT_READ, \
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
71 SSL_ERROR_WANT_WRITE, \
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
72 SSL_ERROR_WANT_X509_LOOKUP, \
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
73 SSL_ERROR_SYSCALL, \
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
74 SSL_ERROR_SSL, \
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
75 SSL_ERROR_WANT_CONNECT, \
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
76 SSL_ERROR_EOF, \
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
77 SSL_ERROR_INVALID_ERROR_CODE
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
78
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
79 import os, sys, warnings
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
80
28890
39f4b97ce828 Extract the errno value to use from the errno module if possible.
Fred Drake <fdrake@acm.org>
parents: 28888
diff changeset
81 try:
39f4b97ce828 Extract the errno value to use from the errno module if possible.
Fred Drake <fdrake@acm.org>
parents: 28888
diff changeset
82 from errno import EBADF
39f4b97ce828 Extract the errno value to use from the errno module if possible.
Fred Drake <fdrake@acm.org>
parents: 28888
diff changeset
83 except ImportError:
39f4b97ce828 Extract the errno value to use from the errno module if possible.
Fred Drake <fdrake@acm.org>
parents: 28888
diff changeset
84 EBADF = 9
39f4b97ce828 Extract the errno value to use from the errno module if possible.
Fred Drake <fdrake@acm.org>
parents: 28888
diff changeset
85
16613
f68dbffff927 bunch more __all__ lists
Skip Montanaro <skip@pobox.com>
parents: 15872
diff changeset
86 __all__ = ["getfqdn"]
f68dbffff927 bunch more __all__ lists
Skip Montanaro <skip@pobox.com>
parents: 15872
diff changeset
87 __all__.extend(os._get_exports_list(_socket))
43008
4771639fc049 This contains a number of things:
Bill Janssen <janssen@parc.com>
parents: 42828
diff changeset
88
16613
f68dbffff927 bunch more __all__ lists
Skip Montanaro <skip@pobox.com>
parents: 15872
diff changeset
89
24661
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
90 _realsocket = socket
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
91
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
92 # WSA error codes
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
93 if sys.platform.lower().startswith("win"):
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
94 errorTab = {}
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
95 errorTab[10004] = "The operation was interrupted."
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
96 errorTab[10009] = "A bad file handle was passed."
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
97 errorTab[10013] = "Permission denied."
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
98 errorTab[10014] = "A fault occurred on the network??" # WSAEFAULT
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
99 errorTab[10022] = "An invalid operation was attempted."
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
100 errorTab[10035] = "The socket operation would block"
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
101 errorTab[10036] = "A blocking operation is already in progress."
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
102 errorTab[10048] = "The network address is in use."
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
103 errorTab[10054] = "The connection has been reset."
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
104 errorTab[10058] = "The network has been shut down."
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
105 errorTab[10060] = "The operation timed out."
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
106 errorTab[10061] = "Connection refused."
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
107 errorTab[10063] = "The name is too long."
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
108 errorTab[10064] = "The host is down."
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
109 errorTab[10065] = "The host is unreachable."
17071
b45ae8c467aa add errorTab to __all__ on win*
Skip Montanaro <skip@pobox.com>
parents: 16949
diff changeset
110 __all__.append("errorTab")
24663
b265e76bab88 Extend __all__ with the exports list of the _ssl module.
Guido van Rossum <guido@python.org>
parents: 24662
diff changeset
111
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
112
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
113
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
114 def getfqdn(name=''):
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
115 """Get fully qualified domain name from name.
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
116
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
117 An empty argument is interpreted as meaning the local host.
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
118
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
119 First the hostname returned by gethostbyaddr() is checked, then
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
120 possibly existing aliases. In case no FQDN is available, hostname
34733
e83309d43a82 Fix test for socket.getfqdn() to also include the name returned by
Brett Cannon <bcannon@gmail.com>
parents: 33063
diff changeset
121 from gethostname() is returned.
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
122 """
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
123 name = name.strip()
14014
3d68d5bccd40 updated occurences of fqdn algorithm (closes patch #101197)
Peter Schneider-Kamp <nowonder@nowonder.de>
parents: 14007
diff changeset
124 if not name or name == '0.0.0.0':
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
125 name = gethostname()
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
126 try:
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
127 hostname, aliases, ipaddrs = gethostbyaddr(name)
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
128 except error:
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
129 pass
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
130 else:
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
131 aliases.insert(0, hostname)
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
132 for name in aliases:
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
133 if '.' in name:
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
134 break
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
135 else:
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
136 name = hostname
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
137 return name
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
138
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
139
19364
b738428238f1 When the socket is closed, don't just assign 0 to self._sock.
Guido van Rossum <guido@python.org>
parents: 17245
diff changeset
140 _socketmethods = (
b738428238f1 When the socket is closed, don't just assign 0 to self._sock.
Guido van Rossum <guido@python.org>
parents: 17245
diff changeset
141 'bind', 'connect', 'connect_ex', 'fileno', 'listen',
b738428238f1 When the socket is closed, don't just assign 0 to self._sock.
Guido van Rossum <guido@python.org>
parents: 17245
diff changeset
142 'getpeername', 'getsockname', 'getsockopt', 'setsockopt',
28888
d3164a304598 Regain throughput lost with the _socketobject wrapper. The
Skip Montanaro <skip@pobox.com>
parents: 28818
diff changeset
143 'sendall', 'setblocking',
44478
73bc002252bf socket.ioctl is only available on Windows
Christian Heimes <christian@cheimes.de>
parents: 44474
diff changeset
144 'settimeout', 'gettimeout', 'shutdown')
73bc002252bf socket.ioctl is only available on Windows
Christian Heimes <christian@cheimes.de>
parents: 44474
diff changeset
145
73bc002252bf socket.ioctl is only available on Windows
Christian Heimes <christian@cheimes.de>
parents: 44474
diff changeset
146 if os.name == "nt":
73bc002252bf socket.ioctl is only available on Windows
Christian Heimes <christian@cheimes.de>
parents: 44474
diff changeset
147 _socketmethods = _socketmethods + ('ioctl',)
19364
b738428238f1 When the socket is closed, don't just assign 0 to self._sock.
Guido van Rossum <guido@python.org>
parents: 17245
diff changeset
148
29066
90342f395721 Patch #734231: Update RiscOS support. In particular, correct
Martin v. Löwis <martin@v.loewis.de>
parents: 28890
diff changeset
149 if sys.platform == "riscos":
90342f395721 Patch #734231: Update RiscOS support. In particular, correct
Martin v. Löwis <martin@v.loewis.de>
parents: 28890
diff changeset
150 _socketmethods = _socketmethods + ('sleeptaskw',)
90342f395721 Patch #734231: Update RiscOS support. In particular, correct
Martin v. Löwis <martin@v.loewis.de>
parents: 28890
diff changeset
151
38976
c547f6e91c58 Release all forwarded functions in .close. Fixes #1513223.
Martin v. Löwis <martin@v.loewis.de>
parents: 38580
diff changeset
152 # All the method names that must be delegated to either the real socket
c547f6e91c58 Release all forwarded functions in .close. Fixes #1513223.
Martin v. Löwis <martin@v.loewis.de>
parents: 38580
diff changeset
153 # object or the _closedsocket object.
c547f6e91c58 Release all forwarded functions in .close. Fixes #1513223.
Martin v. Löwis <martin@v.loewis.de>
parents: 38580
diff changeset
154 _delegate_methods = ("recv", "recvfrom", "recv_into", "recvfrom_into",
c547f6e91c58 Release all forwarded functions in .close. Fixes #1513223.
Martin v. Löwis <martin@v.loewis.de>
parents: 38580
diff changeset
155 "send", "sendto")
c547f6e91c58 Release all forwarded functions in .close. Fixes #1513223.
Martin v. Löwis <martin@v.loewis.de>
parents: 38580
diff changeset
156
24666
4fbf534211b9 The _socketobject class has no need for a __del__ method: all it did was
Guido van Rossum <guido@python.org>
parents: 24665
diff changeset
157 class _closedsocket(object):
4fbf534211b9 The _socketobject class has no need for a __del__ method: all it did was
Guido van Rossum <guido@python.org>
parents: 24665
diff changeset
158 __slots__ = []
28888
d3164a304598 Regain throughput lost with the _socketobject wrapper. The
Skip Montanaro <skip@pobox.com>
parents: 28818
diff changeset
159 def _dummy(*args):
28890
39f4b97ce828 Extract the errno value to use from the errno module if possible.
Fred Drake <fdrake@acm.org>
parents: 28888
diff changeset
160 raise error(EBADF, 'Bad file descriptor')
38976
c547f6e91c58 Release all forwarded functions in .close. Fixes #1513223.
Martin v. Löwis <martin@v.loewis.de>
parents: 38580
diff changeset
161 # All _delegate_methods must also be initialized here.
c547f6e91c58 Release all forwarded functions in .close. Fixes #1513223.
Martin v. Löwis <martin@v.loewis.de>
parents: 38580
diff changeset
162 send = recv = recv_into = sendto = recvfrom = recvfrom_into = _dummy
c547f6e91c58 Release all forwarded functions in .close. Fixes #1513223.
Martin v. Löwis <martin@v.loewis.de>
parents: 38580
diff changeset
163 __getattr__ = _dummy
24666
4fbf534211b9 The _socketobject class has no need for a __del__ method: all it did was
Guido van Rossum <guido@python.org>
parents: 24665
diff changeset
164
42385
e9916a4e06a4 Bug #978833: Close https sockets by releasing the _ssl object.
Martin v. Löwis <martin@v.loewis.de>
parents: 41532
diff changeset
165 # Wrapper around platform socket objects. This implements
e9916a4e06a4 Bug #978833: Close https sockets by releasing the _ssl object.
Martin v. Löwis <martin@v.loewis.de>
parents: 41532
diff changeset
166 # a platform-independent dup() functionality. The
e9916a4e06a4 Bug #978833: Close https sockets by releasing the _ssl object.
Martin v. Löwis <martin@v.loewis.de>
parents: 41532
diff changeset
167 # implementation currently relies on reference counting
e9916a4e06a4 Bug #978833: Close https sockets by releasing the _ssl object.
Martin v. Löwis <martin@v.loewis.de>
parents: 41532
diff changeset
168 # to close the underlying socket object.
24661
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
169 class _socketobject(object):
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
170
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
171 __doc__ = _realsocket.__doc__
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
172
38976
c547f6e91c58 Release all forwarded functions in .close. Fixes #1513223.
Martin v. Löwis <martin@v.loewis.de>
parents: 38580
diff changeset
173 __slots__ = ["_sock", "__weakref__"] + list(_delegate_methods)
24661
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
174
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
175 def __init__(self, family=AF_INET, type=SOCK_STREAM, proto=0, _sock=None):
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
176 if _sock is None:
24662
a61893d7cef2 Oops, stupid tabs. Sorry again.
Guido van Rossum <guido@python.org>
parents: 24661
diff changeset
177 _sock = _realsocket(family, type, proto)
24661
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
178 self._sock = _sock
38976
c547f6e91c58 Release all forwarded functions in .close. Fixes #1513223.
Martin v. Löwis <martin@v.loewis.de>
parents: 38580
diff changeset
179 for method in _delegate_methods:
c547f6e91c58 Release all forwarded functions in .close. Fixes #1513223.
Martin v. Löwis <martin@v.loewis.de>
parents: 38580
diff changeset
180 setattr(self, method, getattr(_sock, method))
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
181
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
182 def close(self):
24666
4fbf534211b9 The _socketobject class has no need for a __del__ method: all it did was
Guido van Rossum <guido@python.org>
parents: 24665
diff changeset
183 self._sock = _closedsocket()
38976
c547f6e91c58 Release all forwarded functions in .close. Fixes #1513223.
Martin v. Löwis <martin@v.loewis.de>
parents: 38580
diff changeset
184 dummy = self._sock._dummy
c547f6e91c58 Release all forwarded functions in .close. Fixes #1513223.
Martin v. Löwis <martin@v.loewis.de>
parents: 38580
diff changeset
185 for method in _delegate_methods:
c547f6e91c58 Release all forwarded functions in .close. Fixes #1513223.
Martin v. Löwis <martin@v.loewis.de>
parents: 38580
diff changeset
186 setattr(self, method, dummy)
24661
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
187 close.__doc__ = _realsocket.close.__doc__
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
188
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
189 def accept(self):
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
190 sock, addr = self._sock.accept()
24661
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
191 return _socketobject(_sock=sock), addr
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
192 accept.__doc__ = _realsocket.accept.__doc__
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
193
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
194 def dup(self):
24661
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
195 """dup() -> socket object
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
196
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
197 Return a new socket object connected to the same system resource."""
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
198 return _socketobject(_sock=self._sock)
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
199
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
200 def makefile(self, mode='r', bufsize=-1):
24661
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
201 """makefile([mode[, bufsize]]) -> file object
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
202
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
203 Return a regular file object corresponding to the socket. The mode
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
204 and bufsize arguments are as for the built-in open() function."""
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
205 return _fileobject(self._sock, mode, bufsize)
37136
71c5694e3423 Whitespace normalization.
Tim Peters <tim.peters@gmail.com>
parents: 37123
diff changeset
206
37123
251ecec04f1b Correct API design mistake from rev. 43126: make socket attributes readonly properties.
Georg Brandl <georg@python.org>
parents: 37069
diff changeset
207 family = property(lambda self: self._sock.family, doc="the socket family")
251ecec04f1b Correct API design mistake from rev. 43126: make socket attributes readonly properties.
Georg Brandl <georg@python.org>
parents: 37069
diff changeset
208 type = property(lambda self: self._sock.type, doc="the socket type")
251ecec04f1b Correct API design mistake from rev. 43126: make socket attributes readonly properties.
Georg Brandl <georg@python.org>
parents: 37069
diff changeset
209 proto = property(lambda self: self._sock.proto, doc="the socket protocol")
37069
dd49847a60d3 RFE #567972: Socket objects' family, type and proto properties are
Georg Brandl <georg@python.org>
parents: 34733
diff changeset
210
24661
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
211 _s = ("def %s(self, *args): return self._sock.%s(*args)\n\n"
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
212 "%s.__doc__ = _realsocket.%s.__doc__\n")
19364
b738428238f1 When the socket is closed, don't just assign 0 to self._sock.
Guido van Rossum <guido@python.org>
parents: 17245
diff changeset
213 for _m in _socketmethods:
24661
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
214 exec _s % (_m, _m, _m, _m)
24673
3796d39f0b80 Delete junk attributes left behind by _socketobject class construction.
Tim Peters <tim.peters@gmail.com>
parents: 24666
diff changeset
215 del _m, _s
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
216
28443
161b8bd8a226 The socket module now always uses the _socketobject wrapper class, even on
Skip Montanaro <skip@pobox.com>
parents: 24944
diff changeset
217 socket = SocketType = _socketobject
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
218
24661
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
219 class _fileobject(object):
24656
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
220 """Faux file object attached to a socket object."""
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
221
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
222 default_bufsize = 8192
24661
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
223 name = "<socket>"
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
224
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
225 __slots__ = ["mode", "bufsize", "softspace",
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
226 # "closed" is a property, see below
40684
2fa6e82b1f17 Patch #1627441: close sockets properly in urllib2.
Georg Brandl <georg@python.org>
parents: 39190
diff changeset
227 "_sock", "_rbufsize", "_wbufsize", "_rbuf", "_wbuf",
2fa6e82b1f17 Patch #1627441: close sockets properly in urllib2.
Georg Brandl <georg@python.org>
parents: 39190
diff changeset
228 "_close"]
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
229
40684
2fa6e82b1f17 Patch #1627441: close sockets properly in urllib2.
Georg Brandl <georg@python.org>
parents: 39190
diff changeset
230 def __init__(self, sock, mode='rb', bufsize=-1, close=False):
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
231 self._sock = sock
24661
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
232 self.mode = mode # Not actually used in this version
24656
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
233 if bufsize < 0:
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
234 bufsize = self.default_bufsize
24662
a61893d7cef2 Oops, stupid tabs. Sorry again.
Guido van Rossum <guido@python.org>
parents: 24661
diff changeset
235 self.bufsize = bufsize
a61893d7cef2 Oops, stupid tabs. Sorry again.
Guido van Rossum <guido@python.org>
parents: 24661
diff changeset
236 self.softspace = False
24656
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
237 if bufsize == 0:
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
238 self._rbufsize = 1
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
239 elif bufsize == 1:
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
240 self._rbufsize = self.default_bufsize
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
241 else:
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
242 self._rbufsize = bufsize
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
243 self._wbufsize = bufsize
24664
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
244 self._rbuf = "" # A string
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
245 self._wbuf = [] # A list of strings
40684
2fa6e82b1f17 Patch #1627441: close sockets properly in urllib2.
Georg Brandl <georg@python.org>
parents: 39190
diff changeset
246 self._close = close
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
247
24661
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
248 def _getclosed(self):
31833
a910b822b12c SF bug 924242: socket._fileobject._getclosed() returns wrong value
Tim Peters <tim.peters@gmail.com>
parents: 29465
diff changeset
249 return self._sock is None
24661
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
250 closed = property(_getclosed, doc="True if the file is closed")
2f411f2d791a Another refactoring. Changed 'socket' from being a factory function
Guido van Rossum <guido@python.org>
parents: 24656
diff changeset
251
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
252 def close(self):
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
253 try:
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
254 if self._sock:
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
255 self.flush()
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
256 finally:
40684
2fa6e82b1f17 Patch #1627441: close sockets properly in urllib2.
Georg Brandl <georg@python.org>
parents: 39190
diff changeset
257 if self._close:
2fa6e82b1f17 Patch #1627441: close sockets properly in urllib2.
Georg Brandl <georg@python.org>
parents: 39190
diff changeset
258 self._sock.close()
23715
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix.
Guido van Rossum <guido@python.org>
parents: 21971
diff changeset
259 self._sock = None
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
260
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
261 def __del__(self):
29311
ed70779f6402 I saw errors from _fileobject.__del__ about missing self._sock. This
Guido van Rossum <guido@python.org>
parents: 29066
diff changeset
262 try:
ed70779f6402 I saw errors from _fileobject.__del__ about missing self._sock. This
Guido van Rossum <guido@python.org>
parents: 29066
diff changeset
263 self.close()
ed70779f6402 I saw errors from _fileobject.__del__ about missing self._sock. This
Guido van Rossum <guido@python.org>
parents: 29066
diff changeset
264 except:
ed70779f6402 I saw errors from _fileobject.__del__ about missing self._sock. This
Guido van Rossum <guido@python.org>
parents: 29066
diff changeset
265 # close() may fail if __init__ didn't complete
ed70779f6402 I saw errors from _fileobject.__del__ about missing self._sock. This
Guido van Rossum <guido@python.org>
parents: 29066
diff changeset
266 pass
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
267
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
268 def flush(self):
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
269 if self._wbuf:
24656
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
270 buffer = "".join(self._wbuf)
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
271 self._wbuf = []
23715
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix.
Guido van Rossum <guido@python.org>
parents: 21971
diff changeset
272 self._sock.sendall(buffer)
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
273
23844
bd37eb4daf3b Cleanup a little
Neal Norwitz <nnorwitz@gmail.com>
parents: 23715
diff changeset
274 def fileno(self):
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
275 return self._sock.fileno()
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
276
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
277 def write(self, data):
24656
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
278 data = str(data) # XXX Should really reject non-string non-buffers
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
279 if not data:
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
280 return
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
281 self._wbuf.append(data)
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
282 if (self._wbufsize == 0 or
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
283 self._wbufsize == 1 and '\n' in data or
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
284 self._get_wbuf_len() >= self._wbufsize):
23715
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix.
Guido van Rossum <guido@python.org>
parents: 21971
diff changeset
285 self.flush()
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
286
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
287 def writelines(self, list):
24656
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
288 # XXX We could do better here for very long lists
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
289 # XXX Should really reject non-string non-buffers
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
290 self._wbuf.extend(filter(None, map(str, list)))
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
291 if (self._wbufsize <= 1 or
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
292 self._get_wbuf_len() >= self._wbufsize):
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
293 self.flush()
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
294
24656
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
295 def _get_wbuf_len(self):
23715
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix.
Guido van Rossum <guido@python.org>
parents: 21971
diff changeset
296 buf_len = 0
24656
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
297 for x in self._wbuf:
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
298 buf_len += len(x)
23715
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix.
Guido van Rossum <guido@python.org>
parents: 21971
diff changeset
299 return buf_len
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix.
Guido van Rossum <guido@python.org>
parents: 21971
diff changeset
300
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix.
Guido van Rossum <guido@python.org>
parents: 21971
diff changeset
301 def read(self, size=-1):
24664
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
302 data = self._rbuf
24656
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
303 if size < 0:
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
304 # Read until EOF
24664
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
305 buffers = []
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
306 if data:
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
307 buffers.append(data)
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
308 self._rbuf = ""
24656
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
309 if self._rbufsize <= 1:
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
310 recv_size = self.default_bufsize
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
311 else:
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
312 recv_size = self._rbufsize
24664
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
313 while True:
24656
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
314 data = self._sock.recv(recv_size)
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
315 if not data:
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
316 break
24664
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
317 buffers.append(data)
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
318 return "".join(buffers)
24656
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
319 else:
24664
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
320 # Read until size bytes or EOF seen, whichever comes first
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
321 buf_len = len(data)
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
322 if buf_len >= size:
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
323 self._rbuf = data[size:]
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
324 return data[:size]
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
325 buffers = []
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
326 if data:
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
327 buffers.append(data)
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
328 self._rbuf = ""
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
329 while True:
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
330 left = size - buf_len
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
331 recv_size = max(self._rbufsize, left)
24656
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
332 data = self._sock.recv(recv_size)
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
333 if not data:
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
334 break
24664
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
335 buffers.append(data)
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
336 n = len(data)
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
337 if n >= left:
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
338 self._rbuf = data[left:]
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
339 buffers[-1] = data[:left]
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
340 break
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
341 buf_len += n
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
342 return "".join(buffers)
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
343
23715
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix.
Guido van Rossum <guido@python.org>
parents: 21971
diff changeset
344 def readline(self, size=-1):
24664
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
345 data = self._rbuf
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
346 if size < 0:
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
347 # Read until \n or EOF, whichever comes first
24665
d25cf94d20b1 OK, one more hack: speed up the case of readline() in unbuffered mode.
Guido van Rossum <guido@python.org>
parents: 24664
diff changeset
348 if self._rbufsize <= 1:
d25cf94d20b1 OK, one more hack: speed up the case of readline() in unbuffered mode.
Guido van Rossum <guido@python.org>
parents: 24664
diff changeset
349 # Speed up unbuffered case
d25cf94d20b1 OK, one more hack: speed up the case of readline() in unbuffered mode.
Guido van Rossum <guido@python.org>
parents: 24664
diff changeset
350 assert data == ""
d25cf94d20b1 OK, one more hack: speed up the case of readline() in unbuffered mode.
Guido van Rossum <guido@python.org>
parents: 24664
diff changeset
351 buffers = []
d25cf94d20b1 OK, one more hack: speed up the case of readline() in unbuffered mode.
Guido van Rossum <guido@python.org>
parents: 24664
diff changeset
352 recv = self._sock.recv
d25cf94d20b1 OK, one more hack: speed up the case of readline() in unbuffered mode.
Guido van Rossum <guido@python.org>
parents: 24664
diff changeset
353 while data != "\n":
d25cf94d20b1 OK, one more hack: speed up the case of readline() in unbuffered mode.
Guido van Rossum <guido@python.org>
parents: 24664
diff changeset
354 data = recv(1)
d25cf94d20b1 OK, one more hack: speed up the case of readline() in unbuffered mode.
Guido van Rossum <guido@python.org>
parents: 24664
diff changeset
355 if not data:
d25cf94d20b1 OK, one more hack: speed up the case of readline() in unbuffered mode.
Guido van Rossum <guido@python.org>
parents: 24664
diff changeset
356 break
d25cf94d20b1 OK, one more hack: speed up the case of readline() in unbuffered mode.
Guido van Rossum <guido@python.org>
parents: 24664
diff changeset
357 buffers.append(data)
d25cf94d20b1 OK, one more hack: speed up the case of readline() in unbuffered mode.
Guido van Rossum <guido@python.org>
parents: 24664
diff changeset
358 return "".join(buffers)
24664
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
359 nl = data.find('\n')
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
360 if nl >= 0:
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
361 nl += 1
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
362 self._rbuf = data[nl:]
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
363 return data[:nl]
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
364 buffers = []
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
365 if data:
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
366 buffers.append(data)
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
367 self._rbuf = ""
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
368 while True:
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
369 data = self._sock.recv(self._rbufsize)
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
370 if not data:
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
371 break
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
372 buffers.append(data)
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
373 nl = data.find('\n')
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
374 if nl >= 0:
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
375 nl += 1
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
376 self._rbuf = data[nl:]
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
377 buffers[-1] = data[:nl]
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
378 break
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
379 return "".join(buffers)
23715
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix.
Guido van Rossum <guido@python.org>
parents: 21971
diff changeset
380 else:
24664
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
381 # Read until size bytes or \n or EOF seen, whichever comes first
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
382 nl = data.find('\n', 0, size)
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
383 if nl >= 0:
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
384 nl += 1
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
385 self._rbuf = data[nl:]
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
386 return data[:nl]
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
387 buf_len = len(data)
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
388 if buf_len >= size:
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
389 self._rbuf = data[size:]
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
390 return data[:size]
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
391 buffers = []
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
392 if data:
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
393 buffers.append(data)
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
394 self._rbuf = ""
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
395 while True:
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
396 data = self._sock.recv(self._rbufsize)
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
397 if not data:
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
398 break
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
399 buffers.append(data)
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
400 left = size - buf_len
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
401 nl = data.find('\n', 0, left)
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
402 if nl >= 0:
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
403 nl += 1
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
404 self._rbuf = data[nl:]
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
405 buffers[-1] = data[:nl]
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
406 break
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
407 n = len(data)
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
408 if n >= left:
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
409 self._rbuf = data[left:]
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
410 buffers[-1] = data[:left]
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
411 break
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
412 buf_len += n
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
413 return "".join(buffers)
23715
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix.
Guido van Rossum <guido@python.org>
parents: 21971
diff changeset
414
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix.
Guido van Rossum <guido@python.org>
parents: 21971
diff changeset
415 def readlines(self, sizehint=0):
14682
295126433856 Support sizehint in _fileobject.readlines, as documented.
Martin v. Löwis <martin@v.loewis.de>
parents: 14592
diff changeset
416 total = 0
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
417 list = []
24664
6a6d02be321c Another refactoring of read() and readline(), this time based on the
Guido van Rossum <guido@python.org>
parents: 24663
diff changeset
418 while True:
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
419 line = self.readline()
23844
bd37eb4daf3b Cleanup a little
Neal Norwitz <nnorwitz@gmail.com>
parents: 23715
diff changeset
420 if not line:
bd37eb4daf3b Cleanup a little
Neal Norwitz <nnorwitz@gmail.com>
parents: 23715
diff changeset
421 break
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
422 list.append(line)
14682
295126433856 Support sizehint in _fileobject.readlines, as documented.
Martin v. Löwis <martin@v.loewis.de>
parents: 14592
diff changeset
423 total += len(line)
295126433856 Support sizehint in _fileobject.readlines, as documented.
Martin v. Löwis <martin@v.loewis.de>
parents: 14592
diff changeset
424 if sizehint and total >= sizehint:
295126433856 Support sizehint in _fileobject.readlines, as documented.
Martin v. Löwis <martin@v.loewis.de>
parents: 14592
diff changeset
425 break
14007
eda09f824a9f Revise the wrapper structure for the socket module:
Fred Drake <fdrake@acm.org>
parents:
diff changeset
426 return list
24656
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
427
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
428 # Iterator protocols
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
429
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
430 def __iter__(self):
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
431 return self
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
432
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
433 def next(self):
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
434 line = self.readline()
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
435 if not line:
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
436 raise StopIteration
e61b118e9cab Major restructuring of _fileobject. Hopefully several things now work
Guido van Rossum <guido@python.org>
parents: 24649
diff changeset
437 return line
41288
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
438
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
439
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
440 def create_connection(address, timeout=None):
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
441 """Connect to address (host, port) with an optional timeout.
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
442
41532
4b9fa8092e82 Whitespace normalization. Ugh, we really need to do this more often.
Neal Norwitz <nnorwitz@gmail.com>
parents: 41288
diff changeset
443 Provides access to socketobject timeout for higher-level
4b9fa8092e82 Whitespace normalization. Ugh, we really need to do this more often.
Neal Norwitz <nnorwitz@gmail.com>
parents: 41288
diff changeset
444 protocols. Passing a timeout will set the timeout on the
41288
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
445 socket instance (if not present, or passed as None, the
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
446 default global timeout setting will be used).
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
447 """
41532
4b9fa8092e82 Whitespace normalization. Ugh, we really need to do this more often.
Neal Norwitz <nnorwitz@gmail.com>
parents: 41288
diff changeset
448
41288
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
449 msg = "getaddrinfo returns an empty list"
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
450 host, port = address
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
451 for res in getaddrinfo(host, port, 0, SOCK_STREAM):
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
452 af, socktype, proto, canonname, sa = res
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
453 sock = None
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
454 try:
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
455 sock = socket(af, socktype, proto)
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
456 if timeout is not None:
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
457 sock.settimeout(timeout)
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
458 sock.connect(sa)
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
459 return sock
41532
4b9fa8092e82 Whitespace normalization. Ugh, we really need to do this more often.
Neal Norwitz <nnorwitz@gmail.com>
parents: 41288
diff changeset
460
41288
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
461 except error, msg:
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
462 if sock is not None:
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
463 sock.close()
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
464
a73aa0b821ca Added a 'create_connect()' function to socket.py, which creates a
Facundo Batista <facundobatista@gmail.com>
parents: 41285
diff changeset
465 raise error, msg