Merge py3-execfile-5129: Switch to custom execfile() implementation, since it missing from Python 3.

Author: allenap
Reviewer: exarkun, itamar
Fixes: #5129


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34775 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge ftp-retr-errors-4913: Pass FTPCmdErrors during FTP.ftp_RETR back to the client.

Author: adiroiban
Reviewer: spiv
Fixes: #4913


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34785 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge remove-google-5768: Remove the deprecated twisted.web.google module.

Author: thijs
Reviewer: spiv
Fixes: #5768

Removes twisted.web.google, which was deprecated in Twisted 11.1, and
associated documentation.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34796 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge ftp-rnfr-tests-4930: Add more FTP server tests.

Author: adiroiban
Reviewer: spiv
Fixes: #4930

Adds some test coverage for the FTP server implementation of the RNFR and RNTO
verbs.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34801 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge remove-doctestcase-5554: Remove twisted.trial.runner.DocTestCase.

Author: moijes12
Reviewer: thijs, spiv
Fixes: #5554

Removes twisted.trial.runner.DocTestCase, which has been deprecated since
Twisted 8.0.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34802 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge conch-should-not-use-builtins-5779: conch should not depend on
__builtlins__ being a dict

Author: Alex
Reviewer: cyli, spiv
Fixes: #5779

Conch uses __builtins__ and assumes that it will be a dict, which is an
implementation of CPython and not guaranteed to dict instead of a module


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34811 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge remove-deprecated-log-functions-5765: Removes deprecated functions from twisted.python.log.

Authors: thijs, spiv
Reviewers: spiv, cyli
Fixes: #5765

Removes startKeepingErrors, flushErrors, _flushErrors, ignoreErrors, _ignore,
clearIgnores and _clearIgnores from twisted.python.log.  They've been
deprecated since Twisted 2.5.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34813 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge store-write-result-sigchld-5734

Author: glyph

Reviewer: ashfall

Fixes: #5734

Fix a minor defect in `_sigchld.c`; store the result of a function in a
container declared to be of the correct size, rather than the incorrect size.



git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34829 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge mail-without-ssl-5783 

Author: exarkun
Reviewer: glyph
Fixes: #5783

Make `twistd mail`'s SSL dependency optional again.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34833 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Apply broken-uri-5736.patch: Correct broken links for the historical documents.

Author: thijs
Reviewer: jesstess
Fixes: #5736


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34836 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge htb-docs-5655: Updated the API documentation for twisted.protocols.htb.

Author: gsk, thijs
Reviewer: jesstess
Fixes: #5655


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34855 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Apply coverage-5784.patch: Remove epytext markup from trial's --coverage option and correct a reference to the temp-directory option.

Author: thijs
Reviewer: ralphm
Fixes: #5784 


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34870 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge srvconnect-default-port-3456: Accept a fallback port to SRVConnector.

Author: ralphm.
Reviewer: dreid, therve.
Fixes: #3456.

SRVConnector will resolve DNS SRV records to determine which host and port
to connect to, given a domain and service name. If there are no SRV records
and the service name is unknown to the local system (e.g. not present in
`/etc/services`, like `xmpp-client` in current versions of OS X), the new
`defaultPort` argument is used as the fallback port. It should hold the port
number registered for the service name by IANA.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34878 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Apply randomhash_test_service.patch: adjust test to consider nondeterministic order of IRC room occupants.

Author: antoine.
Reviewer: ralphm.
Fixes: #5752.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34880 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Apply randomhash_test_jabberxmlstream.patch: adjust test to consider nondeterministic order of XML attributes.

Author: antoine.
Reviewer: ralphm.
Fixes: #5753.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34881 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Replace historic dict.fromkeys().keys() with set()

Author: nry
Reviewer: exarkun
Fixes: #5749


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