[Python-checkins] cpython (3.2): Use www.python.org instead of a hostname pointing to a parked (or squatted)
antoine.pitrou
python-checkins at python.org
Mon Dec 5 01:53:06 CET 2011
http://hg.python.org/cpython/rev/7e310c9cf46e
changeset: 73861:7e310c9cf46e
branch: 3.2
user: Antoine Pitrou <solipsis at pitrou.net>
date: Mon Dec 05 01:37:34 2011 +0100
summary:
Use www.python.org instead of a hostname pointing to a parked (or squatted) domain.
Also, reformat a bit.
files:
Doc/howto/sockets.rst | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/Doc/howto/sockets.rst b/Doc/howto/sockets.rst
--- a/Doc/howto/sockets.rst
+++ b/Doc/howto/sockets.rst
@@ -60,11 +60,10 @@
Roughly speaking, when you clicked on the link that brought you to this page,
your browser did something like the following::
- #create an INET, STREAMing socket
+ # create an INET, STREAMing socket
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- #now connect to the web server on port 80
- # - the normal http port
- s.connect(("www.mcmillan-inc.com", 80))
+ # now connect to the web server on port 80 - the normal http port
+ s.connect(("www.python.org", 80))
When the ``connect`` completes, the socket ``s`` can be used to send
in a request for the text of the page. The same socket will read the
@@ -75,13 +74,11 @@
What happens in the web server is a bit more complex. First, the web server
creates a "server socket"::
- #create an INET, STREAMing socket
- serversocket = socket.socket(
- socket.AF_INET, socket.SOCK_STREAM)
- #bind the socket to a public host,
- # and a well-known port
+ # create an INET, STREAMing socket
+ serversocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ # bind the socket to a public host, and a well-known port
serversocket.bind((socket.gethostname(), 80))
- #become a server socket
+ # become a server socket
serversocket.listen(5)
A couple things to notice: we used ``socket.gethostname()`` so that the socket
@@ -101,10 +98,10 @@
mainloop of the web server::
while True:
- #accept connections from outside
+ # accept connections from outside
(clientsocket, address) = serversocket.accept()
- #now do something with the clientsocket
- #in this case, we'll pretend this is a threaded server
+ # now do something with the clientsocket
+ # in this case, we'll pretend this is a threaded server
ct = client_thread(clientsocket)
ct.run()
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list