r47327 - consistently refer to OpenSSL.SSL so that the intersphinx finds it

Author: hawkowl
Date: Tue Apr 26 00:56:04 2016
New Revision: 47327

Modified:
   branches/apidocs-intersphinx-8290/twisted/internet/_sslverify.py
   branches/apidocs-intersphinx-8290/twisted/internet/ssl.py
   branches/apidocs-intersphinx-8290/twisted/test/test_ssl.py
   branches/apidocs-intersphinx-8290/twisted/web/test/test_agent.py

Log:
consistently refer to OpenSSL.SSL so that the intersphinx finds it

Modified: branches/apidocs-intersphinx-8290/twisted/internet/_sslverify.py
==============================================================================
--- branches/apidocs-intersphinx-8290/twisted/internet/_sslverify.py	(original)
+++ branches/apidocs-intersphinx-8290/twisted/internet/_sslverify.py	Tue Apr 26 00:56:04 2016
@@ -1169,7 +1169,7 @@
     L{optionsForClientTLS} API.
 
     @ivar _ctx: The context to use for new connections.
-    @type _ctx: L{SSL.Context}
+    @type _ctx: L{OpenSSL.SSL.Context}
 
     @ivar _hostname: The hostname to verify, as specified by the application,
         as some human-readable text.
@@ -1196,8 +1196,8 @@
         @param hostname: The hostname to verify as input by a human.
         @type hostname: L{unicode}
 
-        @param ctx: an L{SSL.Context} to use for new connections.
-        @type ctx: L{SSL.Context}.
+        @param ctx: an L{OpenSSL.SSL.Context} to use for new connections.
+        @type ctx: L{OpenSSL.SSL.Context}.
         """
         self._ctx = ctx
         self._hostname = hostname

Modified: branches/apidocs-intersphinx-8290/twisted/internet/ssl.py
==============================================================================
--- branches/apidocs-intersphinx-8290/twisted/internet/ssl.py	(original)
+++ branches/apidocs-intersphinx-8290/twisted/internet/ssl.py	Tue Apr 26 00:56:04 2016
@@ -82,7 +82,7 @@
     handshakes and the subsequent connection.
 
     @ivar _contextFactory: A callable which will be used to create new
-        context objects.  This is typically L{SSL.Context}.
+        context objects.  This is typically L{OpenSSL.SSL.Context}.
     """
     _context = None
 

Modified: branches/apidocs-intersphinx-8290/twisted/test/test_ssl.py
==============================================================================
--- branches/apidocs-intersphinx-8290/twisted/test/test_ssl.py	(original)
+++ branches/apidocs-intersphinx-8290/twisted/test/test_ssl.py	Tue Apr 26 00:56:04 2016
@@ -262,7 +262,8 @@
 if SSL is not None:
     class ServerTLSContext(ssl.DefaultOpenSSLContextFactory):
         """
-        A context factory with a default method set to L{SSL.TLSv1_METHOD}.
+        A context factory with a default method set to
+        L{OpenSSL.SSL.TLSv1_METHOD}.
         """
         isClient = False
 
@@ -298,19 +299,19 @@
 
     def getHandleExceptionType(self):
         """
-        Return L{SSL.Error} as the expected error type which will be raised by
-        a write to the L{OpenSSL.SSL.Connection} object after it has been
-        closed.
+        Return L{OpenSSL.SSL.Error} as the expected error type which will be
+        raised by a write to the L{OpenSSL.SSL.Connection} object after it has
+        been closed.
         """
         return SSL.Error
 
 
     def getHandleErrorCode(self):
         """
-        Return the argument L{SSL.Error} will be constructed with for this
-        case.  This is basically just a random OpenSSL implementation detail.
-        It would be better if this test worked in a way which did not require
-        this.
+        Return the argument L{OpenSSL.SSL.Error} will be constructed with for
+        this case. This is basically just a random OpenSSL implementation
+        detail. It would be better if this test worked in a way which did not
+        require this.
         """
         # Windows 2000 SP 4 and Windows XP SP 2 give back WSAENOTSOCK for
         # SSL.Connection.write for some reason.  The twisted.protocols.tls

Modified: branches/apidocs-intersphinx-8290/twisted/web/test/test_agent.py
==============================================================================
--- branches/apidocs-intersphinx-8290/twisted/web/test/test_agent.py	(original)
+++ branches/apidocs-intersphinx-8290/twisted/web/test/test_agent.py	Tue Apr 26 00:56:04 2016
@@ -1403,7 +1403,7 @@
 
     def test_returnsContext(self):
         """
-        If SSL is present, C{getContext} returns a L{SSL.Context}.
+        If SSL is present, C{getContext} returns a L{OpenSSL.SSL.Context}.
         """
         ctx = self.webClientContextFactory().getContext('example.com', 443)
         self.assertIsInstance(ctx, ssl.SSL.Context)