Merge ninja-in-ecdhe-6586

Author: hynek
Reviewer: lvh
Fixes: #6586

OpenSSLCertificateOptions now tries best-effort to support ECDHE for servers.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@41888 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge merge-reflect-py3-6239: Merge `twisted/python/_reflectpy3.py` into `twisted/python/reflect.py`

Author: multani
Reviewer: hawkowl
Fixes: #6239

Merge `twisted/python/_reflectpy3.py` into `twisted/python/reflect.py`, along with the associated test cases.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@41904 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge deprecate-functions-reflect-6859: Deprecate getcurrent and isinst in twisted.python.reflect

Author: multani
Reviewer: hawkowl
Fixes: #6859

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@41908 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge require-module-api-7014: A requireModule() style API

Author: adiroiban
Reviewer: hawkowl
Fixes: #7014

Introduces an API to allow conditionally importing optional modules.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@41915 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge positioning-3926-3: twisted.positioning, a better positioning framework

Author: lvh, hawkowl
Reviewer: lvh, hawkowl, tom.prince, glyph, exarkun, tazle, dash, therve, ashfall
Fixes: #3926

A better positioning framework. This will replace twisted.protocols.gps.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@41920 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge ordered-constants-6523-2: Constants are now ordered to match definition order.

Author: wsanchez
Reviewer: exarkun, hawkowl
Fixes: #6523

The order in which constants are defined is now also the comparison order for constants.  This is now explicitly implemented with tests and the documentation has been updated.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@41925 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge trusted-ca-openssl-defaults-5446-2: add trustRoot argument to CertificateOptions, and platformTrust API which is what you should always pass to it.

Author: glyph
Reviewer: hynek
Fixes: #5446

Twisted's TLS support now provides a way to ask for user-configured trust roots
rather than having to manually configure such certificate authority
certificates yourself.  twisted.internet.ssl.CertificateOptions now accepts a
new argument, trustRoot, which combines verification flags and trust sources,
as well as a new function that provides a value for that argument,
twisted.internet.ssl.platformTrust, which allows using the trusted platform
certificate authorities from OpenSSL for certificate verification.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@41934 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge check-for-generator-functions-3917: Report test methods which are generator functions in trial TestCases as errors.

Author: habnabit
Reviewers: Julian, jerith
Fixes: #3917

Previously, if a trial TestCase had a test method which was a
generator function, the test would appear to pass even though its
code hadn't run at all. This behavior sometimes occurred if a
test was intended to be decorated with defer.inlineCallbacks, but
the test writer had forgotten to apply the decorator.



git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@41938 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
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