Merge clean-up-web-static-docs-7049

Authors: Alex, hawkowl
Reviewers: hawkowl, Alex
Fixes: #7049

Fixes whitespace and syntax in web-in-60/static-content.rst.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@41977 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge agent-trustRoot-7042: Agent uses platformTrust by default.

Author: alex, dreid, radix

Reviewer: glyph, itamar, exarkun

Fixes: #7042

twisted.web.client.Agent now verifies that the provided server certificate in a TLS connection is trusted by the platform. Until #4888 is completed there are still known MITM attack vectors against Agent. Applications which were relying on the absence of certificate checking will now receive an SSL error.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@41986 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge old-as-hell-openssl-5014: Drop support for older pyOpenSSL.

Author: Alex

Reviewer: exarkun, glyph

Fixes: #5014

Remove support for pyOpenSSL older than 0.10

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@41990 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge no-getattr-please-7051

Author: alex
Reviewer: radix
Fixes: #7051

Clean up unnecessary code which would dynamically determine the
method to shut down a socket.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@42000 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge pyflakes-tap-manhole-7001

Author: adiroiban
Reviewer: radix
Fixes: #7001

Clean up pyflakes warnings in twisted/manhole/ and twisted/tap/.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@42003 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge remove-string-keys-7054

Author: alex
Reviewer: radix
Fixes: #7054

Remove deprecated code that handled public and private
keys in string format.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@42023 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge service-identity-5190

Author: glyph

Reviewer: hawkowl

Fixes: #5190

twisted.internet.ssl.CertificateOptions now provides a 'hostname' field, allowing clients to specify and verify the identity of the peer they're communicating with.  When used with the service_identity library from PyPI, this provides support for service identity verification from RFC 6125, as well as server name indication from RFC 6066.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@42118 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge verify-unicode-7094

Author: glyph

Reviewer: alex

Fixes: #7094

Fix a minor issue with the #5091 merge; pass tests on python 3 when pyOpenSSL is installed but service_identity isn't.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@42130 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge pyflakes-procmon-6992

Author: adiroiban
Reviewer: rwall
Fixes: #6992

Remove unused imports from twisted.runner.procmon. Remaining twisted.runner
pyflakes warnings will be dealt with in #6873.



git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@42135 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge pyflakes-lore-6998

Author: adiroiban
Reviewer: rwall
Fixes: #6998

Cleanup unused imports and uninitialised variables in twisted.lore. Twisted
Lore is now "pyflakes clean".



git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@42138 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge fix-doc-locations-6926-2

Author: hawkowl
Reviewers: exarkun, Alex
Fixes: #6926

Fix the doc locations and add "go to current version of this document" to Sphinx built docs.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@42144 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge pyflakes-spread-6989

Author: adiroiban
Reviewer: rwall
Fixes: #6989

Cleanup unused imports and uninitialised variables in twisted.spread. Twisted
Spread is now "pyflakes clean".



git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@42201 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge logfile-py3-7142: python 3 syntax for logfile.py

Author: Alex
Reviewer: radix
Fixes: #7142

Update syntax of twisted/python/logfile.py to be compatible
with Python 3.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@42211 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge remove-use-of-deferredGenerator-6626-2: Remove all uses of deferredGenerator.

Author: tom.prince
Reviewers: thijs, exarkun
Fixes: #6626

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@42221 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge coding-standard-6042: Improve coding standard in twisted.protocols.test.test_basic.

Author: esacteksab, introom, tom.prince
Reviewer: tom.prince, thijs, rwall
Fixes: #6042

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@42224 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge deprecate-deferredGenerator-6044-4: Deprecate deferredGenerator.

Author: tom.prince
Reviewer: glyph
Fixes: #6044

twisted.internet.defer.deferredGenerator is like
twisted.internet.defer.inlineCallbacks but for Python <= 2.5. Since
Twisted no longer supports Python 2.5, there's no reason to continue
to offer deferredGenerator (inlineCallbacks is better in every way
except for the newer Python requirement).

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@42242 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge branch 'trunk' into 5339-assertRaises-context