Parse SSH keys encrypted with the AES algorithm

In newer versions of OpenSSH, encrypted private keys are encrypted
with AES, rather than the less-secure DES3.  This branch allows
Conch to load those keys.

Author: z3p
Reviewer: therve
Fixes: #5496


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34907 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge imap4-multipart-bodystructure-5763-2

Author: antoine, exarkun
Reviewer: antoine, glyph
Fixes: #5763

Refactor the IMAP4 server's BODYSTRUCTURE response generation code, adding documentation,
unit tests, and fixing several bugs:

  * incorrect ordering of content-language/content-location
  * incorrect structure for header parameters in multiple places
  * overall incorrect structure for multipart/* messages
  * incorrect empty lists which should instead be NILs
  * failure to ever fill in certain other fields like content-id


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34933 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Apply versions-5785-2.patch: Replace the usage of file with open in twisted.python.versions for Python 3 compatibility.

Author: thijs
Reviewer: antoine, vperic
Fixes: #5785
Refs #5627


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34948 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge setup-py3k-4244-2: Make the print statement in setup.py compatible for Python 2.6/3.0

Author: loewis, thijs
Reviewer: thijs, exarkun, antoine
Fixes: #4244

This also adds additional test coverage for twisted.python.dist.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34959 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge ihooks-skip-5138-2: Skip test if ihooks isn't available

Author: vperic
Reviewer: thijs
Fixes: #5138

The ihooks module has been removed in Python 3, but there is a test to
make sure it works correctly. Skip this test if ihooks isn't present. This
does not remove the warning thrown by "-3", but is a viable fix.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34966 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Revert r34948: Apply versions-5785-2.patch

The commit added a test, test_dontAllowOtherObjects, which compares a
Version with a string object. It is however not reliable, as it compares
memory addresses, so revert the whole commit.

Reopens: #5785

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34973 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge test_win32-5818: Make t.python.test/test_win32.py pass in Python 3

Author: vperic
Reviewer: antoine
Fixes: #5818

t.p.win32: Do not import exceptions module

The exceptions module has been removed in Python 3; exceptions are now
stored in builtins. However, the code can be simplified by trying to
assign a WindowsError and catching a NameError, which will work in all
Python versions and allows the removal of a helper function.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34988 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge reactor-adopt-connection-5570-2

Author: therve
Reviewer: exarkun
Fixes: #5570

Add a new IReactorSocket.adoptStreamConnection method which allows registering
an established connection in the reactor.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34989 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge test_fakepwd-5819: Make t.p.test.test_fakepwd pass under Python3

Author: vperic
Reviewer: antoine
Fixes: #5819

In two cases, the next() method of iterators was used; change this to
use the next() function to make the tests Python3 compatible.

Also use the opportunity to change the deprecated "assertEquals" syntax
to "assertEqual".

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@35017 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge test_monkey-5816: Make t.test.test_monkey pass under Python 3

Author: vperic
Reviewer: itamar
Fixes: #5816

Update one raise statement to the more modern syntax to make the tests
pass under both Python 2 and 3.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@35020 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge test_formmethod-5817: Make t.test.test_formmethod pass under Python3

Author: vperic
Reviewer: itamar
Fixes: #5817

Update the raise statements in twisted/python/formmethod.py to the new
syntax and add new tests to cover the two that weren't. Also fix a bug
in the formmethod.File object - the allowNone argument was being
overriden when calling the base class constructor.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@35023 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge drop-25-support-5553-2: Remove support for Python 2.5

Author: vperic
Reviewer: thijs
Fixes: #5553

Python 2.5 is no longer supported, modify the appropriate setup files
and documentation.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@35033 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge disttrial-1784-16

Authors: iratsu, exarkun, glyph, therve
Reviewers: exarkun, jml, glyph, thijs, jesstess, therve
Fixes: #1784

Add a -j option to trial allowing it to run the tests using multiple local processes.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@35034 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Revert r35034: failures on the py-without-modules buildslave

Reopens: #1784


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@35035 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge ipv6-tcp-client-endpoint-5695-3: An IPv6 TCP Client Endpoint

Author: ashfall
Reviewer: exarkun, glyph
Fixes: #5695

Added a new IPv6 stream endpoint, TCP6ClientEndpoint, in twisted.internet.endpoints, which accepts IPv6 host address literals as well as host names (which it resolves to an IPv6 address literal using socket.getaddrinfo).


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@35046 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge illegal-search-4080

Author: danmil
Reviewer: exarkun
Fixes: #4080

Change `IMAP4Server` to handle errors from the search implementation and send back a proper
error response to the client when they occur.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@35079 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Remove dependence on dictionary iteration order from an IMAP4 unit test.

Author: antoine
Reviewer: exarkun
Fixes: #5750



git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@35084 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
he doesn't miss a beat

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@35086 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge remove-unzip-5766: unzip, unzipIter, and countZipFileEntries in twisted.python.zipstream (deprecated in Twisted 11.0) are removed now.

Author: thijs
Reviewer: exarkun
Fixes: #5766


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@35095 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge str-methods-python-4999-2: Replaced calls to functions from the string module in `twisted.python`.

Author: nueces, thijs
Reviewer: lvh, exarkun, vperic, itamar
Fixes: #4999


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@35152 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb