Fix some minor style nits. (I'll leave adding __all__ and making the

docstrings conform to PEP 8 to someone else.)

Lib/ssl.py

@@ -1,8 +1,7 @@
 # Wrapper module for _ssl, providing some additional facilities
 # implemented in Python.  Written by Bill Janssen.
 
-"""\
-This module provides some more Pythonic support for SSL.
+"""This module provides some more Pythonic support for SSL.
 
 Object types:
 
@@ -61,18 +60,20 @@ import _ssl             # if we can't import it, let the error propagate
 
 from _ssl import SSLError
 from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED
-from _ssl import PROTOCOL_SSLv2, PROTOCOL_SSLv3, PROTOCOL_SSLv23, PROTOCOL_TLSv1
+from _ssl import (PROTOCOL_SSLv2, PROTOCOL_SSLv3, PROTOCOL_SSLv23,
+                  PROTOCOL_TLSv1)
 from _ssl import RAND_status, RAND_egd, RAND_add
-from _ssl import \
-     SSL_ERROR_ZERO_RETURN, \
-     SSL_ERROR_WANT_READ, \
-     SSL_ERROR_WANT_WRITE, \
-     SSL_ERROR_WANT_X509_LOOKUP, \
-     SSL_ERROR_SYSCALL, \
-     SSL_ERROR_SSL, \
-     SSL_ERROR_WANT_CONNECT, \
-     SSL_ERROR_EOF, \
-     SSL_ERROR_INVALID_ERROR_CODE
+from _ssl import (
+    SSL_ERROR_ZERO_RETURN,
+    SSL_ERROR_WANT_READ,
+    SSL_ERROR_WANT_WRITE,
+    SSL_ERROR_WANT_X509_LOOKUP,
+    SSL_ERROR_SYSCALL,
+    SSL_ERROR_SSL,
+    SSL_ERROR_WANT_CONNECT,
+    SSL_ERROR_EOF,
+    SSL_ERROR_INVALID_ERROR_CODE,
+    )
 
 from socket import socket, AF_INET, SOCK_STREAM, error
 from socket import getnameinfo as _getnameinfo
@@ -102,7 +103,8 @@ class SSLSocket (socket):
             if _can_dup_socket:
                 nfd = os.dup(fd)
             try:
-                wrapper = socket.__init__(self, family=sock.family, type=sock.type, proto=sock.proto, fileno=nfd)
+                socket.__init__(self, family=sock.family, type=sock.type,
+                                proto=sock.proto, fileno=nfd)
             except:
                 if nfd != fd:
                     os.close(nfd)
@@ -152,7 +154,6 @@ class SSLSocket (socket):
         pass
 
     def read(self, len=1024, buffer=None):
-
         """Read up to LEN bytes and return them.
         Return zero-length string on EOF."""
 
@@ -169,7 +170,6 @@ class SSLSocket (socket):
                 raise
 
     def write(self, data):
-
         """Write DATA to the underlying SSL channel.  Returns
         number of bytes of DATA actually transmitted."""
 
@@ -177,7 +177,6 @@ class SSLSocket (socket):
         return self._sslobj.write(data)
 
     def getpeercert(self, binary_form=False):
-
         """Returns a formatted version of the data in the
         certificate provided by the other end of the SSL channel.
         Return None if no certificate was provided, {} if a
@@ -187,7 +186,6 @@ class SSLSocket (socket):
         return self._sslobj.peer_certificate(binary_form)
 
     def cipher(self):
-
         self._checkClosed()
         if not self._sslobj:
             return None
@@ -195,7 +193,6 @@ class SSLSocket (socket):
             return self._sslobj.cipher()
 
     def send(self, data, flags=0):
-
         self._checkClosed()
         if self._sslobj:
             if flags != 0:
@@ -307,7 +304,6 @@ class SSLSocket (socket):
         socket._real_close(self)
 
     def do_handshake(self):
-
         """Perform a TLS/SSL handshake."""
 
         try:
@@ -317,7 +313,6 @@ class SSLSocket (socket):
             raise
 
     def connect(self, addr):
-
         """Connects to remote ADDR, and then wraps the connection in
         an SSL channel."""
 
@@ -333,7 +328,6 @@ class SSLSocket (socket):
             self.do_handshake()
 
     def accept(self):
-
         """Accepts a new connection from a remote client, and returns
         a tuple containing that new connection wrapped with a server-side
         SSL channel, and the address of the remote client."""
@@ -342,9 +336,11 @@ class SSLSocket (socket):
         return (SSLSocket(sock=newsock,
                           keyfile=self.keyfile, certfile=self.certfile,
                           server_side=True,
-                          cert_reqs=self.cert_reqs, ssl_version=self.ssl_version,
+                          cert_reqs=self.cert_reqs,
+                          ssl_version=self.ssl_version,
                           ca_certs=self.ca_certs,
-                          do_handshake_on_connect=self.do_handshake_on_connect),
+                          do_handshake_on_connect=
+                              self.do_handshake_on_connect),
                 addr)
 
 
@@ -361,7 +357,6 @@ def wrap_socket(sock, keyfile=None, certfile=None,
 # some utility functions
 
 def cert_time_to_seconds(cert_time):
-
     """Takes a date-time string in standard ASN1_print form
     ("MON DAY 24HOUR:MINUTE:SEC YEAR TIMEZONE") and return
     a Python time value in seconds past the epoch."""
@@ -373,7 +368,6 @@ PEM_HEADER = "-----BEGIN CERTIFICATE-----"
 PEM_FOOTER = "-----END CERTIFICATE-----"
 
 def DER_cert_to_PEM_cert(der_cert_bytes):
-
     """Takes a certificate in binary DER format and returns the
     PEM version of it as a string."""
 
@@ -383,7 +377,6 @@ def DER_cert_to_PEM_cert(der_cert_bytes):
             PEM_FOOTER + '\n')
 
 def PEM_cert_to_DER_cert(pem_cert_string):
-
     """Takes a certificate in ASCII PEM format and returns the
     DER-encoded version of it as a byte sequence"""
 
@@ -397,7 +390,6 @@ def PEM_cert_to_DER_cert(pem_cert_string):
     return base64.decodestring(d.encode('ASCII', 'strict'))
 
 def get_server_certificate(addr, ssl_version=PROTOCOL_SSLv3, ca_certs=None):
-
     """Retrieve the certificate from the server at the specified address,
     and return it as a PEM-encoded string.
     If 'ca_certs' is specified, validate the server cert against it.