Merging memory-hole-14.1-7766: Remove references to 14.1 in the codeb…

…ase. Author: hawkowl Reviewer: wsanchez Fixes: twisted#7766 git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@43844 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
yuankui · Feb 6, 2015 · 5260204 · 5260204
1 parent 26c4a92
commit 5260204
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/docs/core/howto/defer-intro.rst b/docs/core/howto/defer-intro.rst
@@ -347,7 +347,7 @@ a couple of things are happening here:
 
 .. note::
 
-    .. versionadded:: 14.1
+    .. versionadded:: 15.0
 
     On Python 3.3 and above, instead of writing ``returnValue(json.loads(responseBody))`` you can instead write ``return json.loads(responseBody)``.
     This can be a significant readability advantage, but unfortunately if you need compatibility with Python 2, this isn't an option.

diff --git a/twisted/conch/test/test_checkers.py b/twisted/conch/test/test_checkers.py
@@ -201,7 +201,7 @@ def setUp(self):
 
     def test_deprecated(self):
         """
-        L{SSHPublicKeyDatabase} is deprecated as of version 14.1
+        L{SSHPublicKeyDatabase} is deprecated as of version 15.0
         """
         warningsShown = self.flushWarnings(
             offendingFunctions=[self.setUp])

diff --git a/twisted/internet/_sslverify.py b/twisted/internet/_sslverify.py
@@ -746,7 +746,7 @@ def keyHash(self):
         certificates share the same public key; it is not really useful for
         anything else.
 
-        In versions of Twisted prior to 14.1, C{keyHash} used a technique
+        In versions of Twisted prior to 15.0, C{keyHash} used a technique
         involving certificate requests for computing the hash that was not
         stable in the face of changes to the underlying OpenSSL library.
 

diff --git a/twisted/topfiles/7766.misc b/twisted/topfiles/7766.misc
diff --git a/twisted/web/iweb.py b/twisted/web/iweb.py
@@ -756,7 +756,7 @@ class IAgentEndpointFactory(Interface):
     used for outgoing Agent requests. This is useful in the case of needing to
     proxy outgoing connections, or to otherwise vary the transport used.
 
-    @since: 14.1
+    @since: 15.0
     """
 
     def endpointForURI(uri):