Wrap SSL adapter base interface with ABC

cheroot/ssl/__init__.py

@@ -1,3 +1,11 @@
+"""Implementation of the SSL adapter base interface."""
+
+from abc import ABCMeta, abstractmethod
+
+from six import add_metaclass
+
+
+@add_metaclass(ABCMeta)
 class Adapter(object):
     """Base class for SSL driver library adapters.
 
@@ -8,15 +16,31 @@ class Adapter(object):
           socket file object``
     """
 
+    @abstractmethod
     def __init__(self, certificate, private_key, certificate_chain=None, ciphers=None):
+        """Set up certificates, private key ciphers and reset context."""
         self.certificate = certificate
         self.private_key = private_key
         self.certificate_chain = certificate_chain
         self.ciphers = ciphers
         self.context = None
 
+    @abstractmethod
+    def bind(self, sock):
+        """Wrap and return the given socket."""
+        return sock
+
+    @abstractmethod
     def wrap(self, sock):
-        raise NotImplemented
+        """Wrap and return the given socket, plus WSGI environ entries."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def get_environ(self):
+        """Return WSGI environ entries to be merged into each request."""
+        raise NotImplementedError
 
+    @abstractmethod
     def makefile(self, sock, mode='r', bufsize=-1):
-        raise NotImplemented
+        """Return socket file object."""
+        raise NotImplementedError

cheroot/ssl/builtin.py

@@ -48,7 +48,7 @@ class BuiltinSSLAdapter(Adapter):
     """The ciphers list of SSL."""
 
     def __init__(self, certificate, private_key, certificate_chain=None, ciphers=None):
-        """Set up context and ciphers in addition to base class properties if available."""
+        """Set up context in addition to base class properties if available."""
         if ssl is None:
             raise ImportError('You must install the ssl module to use HTTPS.')
 
@@ -65,7 +65,7 @@ def __init__(self, certificate, private_key, certificate_chain=None, ciphers=Non
 
     def bind(self, sock):
         """Wrap and return the given socket."""
-        return sock
+        return super(BuiltinSSLAdapter, self).bind(sock)
 
     def wrap(self, sock):
         """Wrap and return the given socket, plus WSGI environ entries."""

cheroot/ssl/pyopenssl.py

@@ -245,6 +245,7 @@ def get_environ(self):
         return ssl_environ
 
     def makefile(self, sock, mode='r', bufsize=-1):
+        """Return socket file object."""
         if SSL and isinstance(sock, SSL.ConnectionType):
             timeout = sock.gettimeout()
             f = SSL_fileobject(sock, mode, bufsize)