[Python-3000-checkins] r59003 - python/branches/py3k/Lib/ssl.py
guido.van.rossum
python-3000-checkins at python.org
Fri Nov 16 01:06:12 CET 2007
Author: guido.van.rossum
Date: Fri Nov 16 01:06:11 2007
New Revision: 59003
Modified:
python/branches/py3k/Lib/ssl.py
Log:
Fix some minor style nits. (I'll leave adding __all__ and making the
docstrings conform to PEP 8 to someone else.)
Modified: python/branches/py3k/Lib/ssl.py
==============================================================================
--- python/branches/py3k/Lib/ssl.py (original)
+++ python/branches/py3k/Lib/ssl.py Fri Nov 16 01:06:11 2007
@@ -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 @@
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
@@ -80,7 +81,7 @@
import base64 # for DER-to-PEM translation
_can_dup_socket = hasattr(socket, "dup")
-class SSLSocket (socket):
+class SSLSocket(socket):
"""This class implements a subtype of socket.socket that wraps
the underlying OS socket in an SSL context when necessary, and
@@ -102,7 +103,8 @@
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 @@
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 @@
raise
def write(self, data):
-
"""Write DATA to the underlying SSL channel. Returns
number of bytes of DATA actually transmitted."""
@@ -177,7 +177,6 @@
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
@@ -186,16 +185,14 @@
self._checkClosed()
return self._sslobj.peer_certificate(binary_form)
- def cipher (self):
-
+ def cipher(self):
self._checkClosed()
if not self._sslobj:
return None
else:
return self._sslobj.cipher()
- def send (self, data, flags=0):
-
+ def send(self, data, flags=0):
self._checkClosed()
if self._sslobj:
if flags != 0:
@@ -217,7 +214,7 @@
else:
return socket.send(self, data, flags)
- def send_to (self, data, addr, flags=0):
+ def send_to(self, data, addr, flags=0):
self._checkClosed()
if self._sslobj:
raise ValueError("send_to not allowed on instances of %s" %
@@ -225,7 +222,7 @@
else:
return socket.send_to(self, data, addr, flags)
- def sendall (self, data, flags=0):
+ def sendall(self, data, flags=0):
self._checkClosed()
if self._sslobj:
amount = len(data)
@@ -237,13 +234,13 @@
else:
return socket.sendall(self, data, flags)
- def recv (self, buflen=1024, flags=0):
+ def recv(self, buflen=1024, flags=0):
self._checkClosed()
if self._sslobj:
if flags != 0:
raise ValueError(
- "non-zero flags not allowed in calls to recv_into() on %s" %
- self.__class__)
+ "non-zero flags not allowed in calls to recv_into() on %s" %
+ self.__class__)
while True:
try:
return self.read(buflen)
@@ -255,7 +252,7 @@
else:
return socket.recv(self, buflen, flags)
- def recv_into (self, buffer, nbytes=None, flags=0):
+ def recv_into(self, buffer, nbytes=None, flags=0):
self._checkClosed()
if buffer and (nbytes is None):
nbytes = len(buffer)
@@ -264,8 +261,8 @@
if self._sslobj:
if flags != 0:
raise ValueError(
- "non-zero flags not allowed in calls to recv_into() on %s" %
- self.__class__)
+ "non-zero flags not allowed in calls to recv_into() on %s" %
+ self.__class__)
while True:
try:
v = self.read(nbytes, buffer)
@@ -279,7 +276,7 @@
else:
return socket.recv_into(self, buffer, nbytes, flags)
- def recv_from (self, addr, buflen=1024, flags=0):
+ def recv_from(self, addr, buflen=1024, flags=0):
self._checkClosed()
if self._sslobj:
raise ValueError("recv_from not allowed on instances of %s" %
@@ -287,27 +284,26 @@
else:
return socket.recv_from(self, addr, buflen, flags)
- def pending (self):
+ def pending(self):
self._checkClosed()
if self._sslobj:
return self._sslobj.pending()
else:
return 0
- def shutdown (self, how):
+ def shutdown(self, how):
self._checkClosed()
self._sslobj = None
socket.shutdown(self, how)
- def _real_close (self):
+ def _real_close(self):
self._sslobj = None
# self._closed = True
if self._base:
self._base.close()
socket._real_close(self)
- def do_handshake (self):
-
+ def do_handshake(self):
"""Perform a TLS/SSL handshake."""
try:
@@ -317,7 +313,6 @@
raise
def connect(self, addr):
-
"""Connects to remote ADDR, and then wraps the connection in
an SSL channel."""
@@ -333,7 +328,6 @@
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 @@
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 @@
# 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_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 @@
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"""
@@ -396,8 +389,7 @@
d = pem_cert_string.strip()[len(PEM_HEADER):-len(PEM_FOOTER)]
return base64.decodestring(d.encode('ASCII', 'strict'))
-def get_server_certificate (addr, ssl_version=PROTOCOL_SSLv3, ca_certs=None):
-
+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.
@@ -415,7 +407,7 @@
s.close()
return DER_cert_to_PEM_cert(dercert)
-def get_protocol_name (protocol_code):
+def get_protocol_name(protocol_code):
if protocol_code == PROTOCOL_TLSv1:
return "TLSv1"
elif protocol_code == PROTOCOL_SSLv23:
More information about the Python-3000-checkins
mailing list