[Python-checkins] cpython (merge 3.4 -> default): Merge socket howto fixes from 3.4.

[ezio.melotti]

http://hg.python.org/cpython/rev/61c41cf0b488
changeset:   91447:61c41cf0b488
parent:      91445:cadef389fdbc
parent:      91446:e3f0347e682e
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Jun 27 16:34:57 2014 +0300
summary:
  Merge socket howto fixes from 3.4.

files:
  Doc/howto/sockets.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/howto/sockets.rst b/Doc/howto/sockets.rst
--- a/Doc/howto/sockets.rst
+++ b/Doc/howto/sockets.rst
@@ -180,7 +180,7 @@
 Assuming you don't want to end the connection, the simplest solution is a fixed
 length message::
 
-   class mysocket:
+   class MySocket:
        """demonstration class only
          - coded for clarity, not efficiency
        """
@@ -189,8 +189,8 @@
            if sock is None:
                self.sock = socket.socket(
                                socket.AF_INET, socket.SOCK_STREAM)
-               else:
-                   self.sock = sock
+           else:
+               self.sock = sock
 
        def connect(self, host, port):
            self.sock.connect((host, port))

-- 
Repository URL: http://hg.python.org/cpython