Twisted Core 17.1.0 (2017-02-04)

================================

Features
--------
 - Added a new interface,
   twisted.internet.interfaces.IHostnameResolver, which is an
   improvement to twisted.internet.interfaces.IResolverSimple that
   supports resolving multiple addresses as well as resolving IPv6
   addresses.  This is a native, asynchronous, Twisted analogue to
   getaddrinfo. (bug-4362)
 - twisted.web.client.Agent now uses HostnameEndpoint internally; as a
   consequence, it now supports IPv6, as well as making connections
   faster and more reliably to hosts that have more than one DNS name.
   (bug-6712)
 - twisted.internet.ssl.CertificateOptions now has the new constructor
   argument 'raiseMinimumTo', allowing you to increase the minimum TLS
   version to this version or Twisted's default, whichever is higher.
   The additional new constructor arguments 'lowerMaximumSecurityTo'
   and 'insecurelyLowerMinimumTo' allow finer grained control over
   negotiated versions that don't honour Twisted's defaults, for
   working around broken peers, at the cost of reducing the security
   of the TLS it will negotiate. (bug-6800)
 - twisted.internet.ssl.CertificateOptions now sets the OpenSSL
   context's mode to MODE_RELEASE_BUFFERS, which will free the
   read/write buffers on idle TLS connections to save memory. (bug-8247)
 - trial --help-reactors will only list reactors which can be
   imported.  (bug-8745)
 - twisted.internet.endpoints.HostnameEndpoint now uses the passed
   reactor's implementation of
   twisted.internet.interfaces.IReactorPluggableResolver to resolve
   hostnames rather than its own deferToThread/getaddrinfo wrapper;
   this makes its hostname resolution pluggable via a public API.
   (bug-8922)
 - twisted.internet.reactor.spawnProcess now does not emit a
   deprecation warning on Unicode arguments. It will encode Unicode
   arguments down to bytes using the filesystem encoding on UNIX and
   Python 2 on Windows, and pass Unicode through unchanged on Python 3
   on Windows. (bug-8941)
 - twisted.trial._dist.test.test_distreporter now works on Python 3.
   (bug-8943)

Bugfixes
--------
 - trial --help-reactors will now display iocp and win32er reactors
   with Python 3. (bug-8745)
 - twisted.logger._flatten.flattenEvent now handles log_format being
   None instead of assuming the value is always a string. (bug-8860)
 - twisted.protocol.ftp is now Python 3 compatible (bug-8865)
 - twisted.names.client.Resolver can now resolve names with IPv6 DNS
   servers. (bug-8877)
 - twisted.application.internet.ClientService now waits for existing
   connections to disconnect before trying to connect again when
   restarting. (bug-8899)
 - twisted.internet.unix.Server.doRead and
   twisted.internet.unix.Client.doRead no longer fail if recvmsg's
   ancilliary data contains more than one file descriptor. (bug-8911)
 - twist on Python 3 now correctly prints the help text when given no
   plugin to run. (bug-8918)
 - twisted.python.sendmsg.sendmsg no longer segfaults on Linux +
   Python 2. (bug-8969)
 - IHandshakeListener providers connected via SSL4ClientEndpoint will
   now have their handshakeCompleted methods called. (bug-8973)
 - The twist script now respects the --reactor option. (bug-8983)
 - Fix crash when using SynchronousTestCase with Warning object which
   does not store a string as its first argument (like
   libmysqlclient). (bug-9005)
 - twisted.python.compat.execfile() does not open files with the
   deprecated 'U' flag on Python 3. (bug-9012)

Deprecations and Removals
-------------------------
 - twisted.internet.ssl.CertificateOption's 'method' constructor
   argument is now deprecated, in favour of the new 'raiseMinimumTo',
   'lowerMaximumSecurityTo', and 'insecurelyLowerMinimumTo' arguments.
   (bug-6800)
 - twisted.protocols.telnet (not to be confused with the supported
   twisted.conch.telnet), deprecated since Twisted 2.5, has been
   removed. (bug-8925)
 - twisted.application.strports.parse, as well as the deprecated
   default arguments in strports.service/listen, deprecated since
   Twisted 10.2, has been removed. (bug-8926)
 - twisted.web.client.getPage and twisted.web.client.downloadPage have
   been deprecated in favour of https://pypi.org/project/treq and
   twisted.web.client.Agent. (bug-8960)
 - twisted.internet.defer.timeout is deprecated in favor of
   twisted.internet.defer.Deferred.addTimeout (bug-8971)

4 files changed, 337 insertions, 327 deletions

diff --git a/net/py-twisted/Makefile b/net/py-twisted/Makefile
index 80d04d69ffd..78a2314e045 100644
--- a/net/py-twisted/Makefile
+++ b/net/py-twisted/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.30 2016/11/30 12:28:50 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2017/02/13 18:59:04 adam Exp $
 
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=	1
 COMMENT=	Framework for writing networked applications
 .include "../../net/py-twisted/Makefile.common"
 
 DEPENDS+=	${PYPKGPREFIX}-constantly-[0-9]*:../../devel/py-constantly
 DEPENDS+=	${PYPKGPREFIX}-incremental-[0-9]*:../../devel/py-incremental
 DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL
+DEPENDS+=	${PYPKGPREFIX}-service_identity-[0-9]*:../../security/py-service_identity
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface>=3.0.1:../../devel/py-ZopeInterface
 
 REPLACE_PYTHON+=	src/twisted/mail/test/pop3testserver.py
@@ -25,10 +25,9 @@ pre-install:
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
-		for i in cftp ckeygen conch mailmail pyhtmlizer tkconch trial twist twistd; \
-		do \
-			${MV} $$i $$i-${PYVERSSUFFIX}; \
-		done
+	for i in cftp ckeygen conch mailmail pyhtmlizer tkconch trial twist twistd; do \
+		${MV} $$i $$i-${PYVERSSUFFIX}; \
+	done
 
 # Do not "make package" after running "make test"; this will result in files
 # being installed that should not be.
@@ -41,5 +40,4 @@ CHECK_FILES_SKIP+=	${PREFIX}/${PYSITELIB}/twisted/plugins/dropin.cache
 # egg.mk restricts the Python version list
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/application.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-twisted/Makefile.common b/net/py-twisted/Makefile.common
index db1ad2a0b34..4251228b5d9 100644
--- a/net/py-twisted/Makefile.common
+++ b/net/py-twisted/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.37 2017/01/01 14:43:52 wiz Exp $
+# $NetBSD: Makefile.common,v 1.38 2017/02/13 18:59:04 adam Exp $
 #
 # used by net/py-twisted/Makefile
 # used by net/py-twisted-docs/Makefile
 
-DISTNAME=	Twisted-16.6.0
+DISTNAME=	Twisted-17.1.0
 CATEGORIES=	net python
 MASTER_SITES=	http://twistedmatrix.com/Releases/Twisted/${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=	.tar.bz2
@@ -14,5 +14,3 @@ LICENSE=	mit
 
 DISTINFO_FILE?=		${.CURDIR}/../py-twisted/distinfo
 PATCHDIR?=		${.CURDIR}/../py-twisted/patches
-
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # many parts not yet ported as of 16.5.0 (PLIST: 465 files missing)
diff --git a/net/py-twisted/PLIST b/net/py-twisted/PLIST
index fae94884c55..9dd7d1470a7 100644
--- a/net/py-twisted/PLIST
+++ b/net/py-twisted/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.26 2016/11/28 13:55:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.27 2017/02/13 18:59:04 adam Exp $
 bin/cftp-${PYVERSSUFFIX}
 bin/ckeygen-${PYVERSSUFFIX}
 bin/conch-${PYVERSSUFFIX}
-bin/mailmail-${PYVERSSUFFIX}
+${PLIST.py2x}bin/mailmail-${PYVERSSUFFIX}
 bin/pyhtmlizer-${PYVERSSUFFIX}
 bin/tkconch-${PYVERSSUFFIX}
 bin/trial-${PYVERSSUFFIX}
@@ -78,6 +78,9 @@ ${PYSITELIB}/twisted/application/runner/__init__.pyo
 ${PYSITELIB}/twisted/application/runner/_exit.py
 ${PYSITELIB}/twisted/application/runner/_exit.pyc
 ${PYSITELIB}/twisted/application/runner/_exit.pyo
+${PYSITELIB}/twisted/application/runner/_pidfile.py
+${PYSITELIB}/twisted/application/runner/_pidfile.pyc
+${PYSITELIB}/twisted/application/runner/_pidfile.pyo
 ${PYSITELIB}/twisted/application/runner/_runner.py
 ${PYSITELIB}/twisted/application/runner/_runner.pyc
 ${PYSITELIB}/twisted/application/runner/_runner.pyo
@@ -87,6 +90,9 @@ ${PYSITELIB}/twisted/application/runner/test/__init__.pyo
 ${PYSITELIB}/twisted/application/runner/test/test_exit.py
 ${PYSITELIB}/twisted/application/runner/test/test_exit.pyc
 ${PYSITELIB}/twisted/application/runner/test/test_exit.pyo
+${PYSITELIB}/twisted/application/runner/test/test_pidfile.py
+${PYSITELIB}/twisted/application/runner/test/test_pidfile.pyc
+${PYSITELIB}/twisted/application/runner/test/test_pidfile.pyo
 ${PYSITELIB}/twisted/application/runner/test/test_runner.py
 ${PYSITELIB}/twisted/application/runner/test/test_runner.pyc
 ${PYSITELIB}/twisted/application/runner/test/test_runner.pyo
@@ -462,6 +468,9 @@ ${PYSITELIB}/twisted/internet/_dumbwin32proc.pyo
 ${PYSITELIB}/twisted/internet/_glibbase.py
 ${PYSITELIB}/twisted/internet/_glibbase.pyc
 ${PYSITELIB}/twisted/internet/_glibbase.pyo
+${PYSITELIB}/twisted/internet/_idna.py
+${PYSITELIB}/twisted/internet/_idna.pyc
+${PYSITELIB}/twisted/internet/_idna.pyo
 ${PYSITELIB}/twisted/internet/_newtls.py
 ${PYSITELIB}/twisted/internet/_newtls.pyc
 ${PYSITELIB}/twisted/internet/_newtls.pyo
@@ -474,15 +483,21 @@ ${PYSITELIB}/twisted/internet/_posixserialport.pyo
 ${PYSITELIB}/twisted/internet/_posixstdio.py
 ${PYSITELIB}/twisted/internet/_posixstdio.pyc
 ${PYSITELIB}/twisted/internet/_posixstdio.pyo
+${PYSITELIB}/twisted/internet/_producer_helpers.py
+${PYSITELIB}/twisted/internet/_producer_helpers.pyc
+${PYSITELIB}/twisted/internet/_producer_helpers.pyo
+${PYSITELIB}/twisted/internet/_resolver.py
+${PYSITELIB}/twisted/internet/_resolver.pyc
+${PYSITELIB}/twisted/internet/_resolver.pyo
 ${PYSITELIB}/twisted/internet/_signals.py
 ${PYSITELIB}/twisted/internet/_signals.pyc
 ${PYSITELIB}/twisted/internet/_signals.pyo
 ${PYSITELIB}/twisted/internet/_sslverify.py
 ${PYSITELIB}/twisted/internet/_sslverify.pyc
 ${PYSITELIB}/twisted/internet/_sslverify.pyo
-${PYSITELIB}/twisted/internet/_threadedselect.py
-${PYSITELIB}/twisted/internet/_threadedselect.pyc
-${PYSITELIB}/twisted/internet/_threadedselect.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/internet/_threadedselect.py
+${PLIST.py2x}${PYSITELIB}/twisted/internet/_threadedselect.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/internet/_threadedselect.pyo
 ${PYSITELIB}/twisted/internet/_win32serialport.py
 ${PYSITELIB}/twisted/internet/_win32serialport.pyc
 ${PYSITELIB}/twisted/internet/_win32serialport.pyo
@@ -525,12 +540,12 @@ ${PYSITELIB}/twisted/internet/fdesc.pyo
 ${PYSITELIB}/twisted/internet/gireactor.py
 ${PYSITELIB}/twisted/internet/gireactor.pyc
 ${PYSITELIB}/twisted/internet/gireactor.pyo
-${PYSITELIB}/twisted/internet/glib2reactor.py
-${PYSITELIB}/twisted/internet/glib2reactor.pyc
-${PYSITELIB}/twisted/internet/glib2reactor.pyo
-${PYSITELIB}/twisted/internet/gtk2reactor.py
-${PYSITELIB}/twisted/internet/gtk2reactor.pyc
-${PYSITELIB}/twisted/internet/gtk2reactor.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/internet/glib2reactor.py
+${PLIST.py2x}${PYSITELIB}/twisted/internet/glib2reactor.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/internet/glib2reactor.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/internet/gtk2reactor.py
+${PLIST.py2x}${PYSITELIB}/twisted/internet/gtk2reactor.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/internet/gtk2reactor.pyo
 ${PYSITELIB}/twisted/internet/gtk3reactor.py
 ${PYSITELIB}/twisted/internet/gtk3reactor.pyc
 ${PYSITELIB}/twisted/internet/gtk3reactor.pyo
@@ -592,9 +607,9 @@ ${PYSITELIB}/twisted/internet/process.pyo
 ${PYSITELIB}/twisted/internet/protocol.py
 ${PYSITELIB}/twisted/internet/protocol.pyc
 ${PYSITELIB}/twisted/internet/protocol.pyo
-${PYSITELIB}/twisted/internet/pyuisupport.py
-${PYSITELIB}/twisted/internet/pyuisupport.pyc
-${PYSITELIB}/twisted/internet/pyuisupport.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/internet/pyuisupport.py
+${PLIST.py2x}${PYSITELIB}/twisted/internet/pyuisupport.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/internet/pyuisupport.pyo
 ${PYSITELIB}/twisted/internet/reactor.py
 ${PYSITELIB}/twisted/internet/reactor.pyc
 ${PYSITELIB}/twisted/internet/reactor.pyo
@@ -644,12 +659,12 @@ ${PYSITELIB}/twisted/internet/test/modulehelpers.pyo
 ${PYSITELIB}/twisted/internet/test/process_cli.py
 ${PYSITELIB}/twisted/internet/test/process_cli.pyc
 ${PYSITELIB}/twisted/internet/test/process_cli.pyo
-${PYSITELIB}/twisted/internet/test/process_connectionlost.py
-${PYSITELIB}/twisted/internet/test/process_connectionlost.pyc
-${PYSITELIB}/twisted/internet/test/process_connectionlost.pyo
-${PYSITELIB}/twisted/internet/test/process_gireactornocompat.py
-${PYSITELIB}/twisted/internet/test/process_gireactornocompat.pyc
-${PYSITELIB}/twisted/internet/test/process_gireactornocompat.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/internet/test/process_connectionlost.py
+${PLIST.py2x}${PYSITELIB}/twisted/internet/test/process_connectionlost.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/internet/test/process_connectionlost.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/internet/test/process_gireactornocompat.py
+${PLIST.py2x}${PYSITELIB}/twisted/internet/test/process_gireactornocompat.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/internet/test/process_gireactornocompat.pyo
 ${PYSITELIB}/twisted/internet/test/process_helper.py
 ${PYSITELIB}/twisted/internet/test/process_helper.pyc
 ${PYSITELIB}/twisted/internet/test/process_helper.pyo
@@ -728,6 +743,9 @@ ${PYSITELIB}/twisted/internet/test/test_process.pyo
 ${PYSITELIB}/twisted/internet/test/test_protocol.py
 ${PYSITELIB}/twisted/internet/test/test_protocol.pyc
 ${PYSITELIB}/twisted/internet/test/test_protocol.pyo
+${PYSITELIB}/twisted/internet/test/test_resolver.py
+${PYSITELIB}/twisted/internet/test/test_resolver.pyc
+${PYSITELIB}/twisted/internet/test/test_resolver.pyo
 ${PYSITELIB}/twisted/internet/test/test_serialport.py
 ${PYSITELIB}/twisted/internet/test/test_serialport.pyc
 ${PYSITELIB}/twisted/internet/test/test_serialport.pyo
@@ -767,9 +785,9 @@ ${PYSITELIB}/twisted/internet/test/test_win32events.pyo
 ${PYSITELIB}/twisted/internet/threads.py
 ${PYSITELIB}/twisted/internet/threads.pyc
 ${PYSITELIB}/twisted/internet/threads.pyo
-${PYSITELIB}/twisted/internet/tksupport.py
-${PYSITELIB}/twisted/internet/tksupport.pyc
-${PYSITELIB}/twisted/internet/tksupport.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/internet/tksupport.py
+${PLIST.py2x}${PYSITELIB}/twisted/internet/tksupport.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/internet/tksupport.pyo
 ${PYSITELIB}/twisted/internet/udp.py
 ${PYSITELIB}/twisted/internet/udp.pyc
 ${PYSITELIB}/twisted/internet/udp.pyo
@@ -782,12 +800,12 @@ ${PYSITELIB}/twisted/internet/utils.pyo
 ${PYSITELIB}/twisted/internet/win32eventreactor.py
 ${PYSITELIB}/twisted/internet/win32eventreactor.pyc
 ${PYSITELIB}/twisted/internet/win32eventreactor.pyo
-${PYSITELIB}/twisted/internet/wxreactor.py
-${PYSITELIB}/twisted/internet/wxreactor.pyc
-${PYSITELIB}/twisted/internet/wxreactor.pyo
-${PYSITELIB}/twisted/internet/wxsupport.py
-${PYSITELIB}/twisted/internet/wxsupport.pyc
-${PYSITELIB}/twisted/internet/wxsupport.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/internet/wxreactor.py
+${PLIST.py2x}${PYSITELIB}/twisted/internet/wxreactor.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/internet/wxreactor.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/internet/wxsupport.py
+${PLIST.py2x}${PYSITELIB}/twisted/internet/wxsupport.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/internet/wxsupport.pyo
 ${PYSITELIB}/twisted/logger/__init__.py
 ${PYSITELIB}/twisted/logger/__init__.pyc
 ${PYSITELIB}/twisted/logger/__init__.pyo
@@ -878,98 +896,97 @@ ${PYSITELIB}/twisted/logger/test/test_stdlib.pyo
 ${PYSITELIB}/twisted/logger/test/test_util.py
 ${PYSITELIB}/twisted/logger/test/test_util.pyc
 ${PYSITELIB}/twisted/logger/test/test_util.pyo
-${PYSITELIB}/twisted/mail/__init__.py
-${PYSITELIB}/twisted/mail/__init__.pyc
-${PYSITELIB}/twisted/mail/__init__.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/__init__.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/__init__.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/__init__.pyo
 ${PYSITELIB}/twisted/mail/_cred.py
 ${PYSITELIB}/twisted/mail/_cred.pyc
 ${PYSITELIB}/twisted/mail/_cred.pyo
 ${PYSITELIB}/twisted/mail/_except.py
 ${PYSITELIB}/twisted/mail/_except.pyc
 ${PYSITELIB}/twisted/mail/_except.pyo
-${PYSITELIB}/twisted/mail/alias.py
-${PYSITELIB}/twisted/mail/alias.pyc
-${PYSITELIB}/twisted/mail/alias.pyo
-${PYSITELIB}/twisted/mail/bounce.py
-${PYSITELIB}/twisted/mail/bounce.pyc
-${PYSITELIB}/twisted/mail/bounce.pyo
-${PYSITELIB}/twisted/mail/imap4.py
-${PYSITELIB}/twisted/mail/imap4.pyc
-${PYSITELIB}/twisted/mail/imap4.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/alias.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/alias.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/alias.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/bounce.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/bounce.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/bounce.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/imap4.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/imap4.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/imap4.pyo
 ${PYSITELIB}/twisted/mail/interfaces.py
 ${PYSITELIB}/twisted/mail/interfaces.pyc
 ${PYSITELIB}/twisted/mail/interfaces.pyo
-${PYSITELIB}/twisted/mail/mail.py
-${PYSITELIB}/twisted/mail/mail.pyc
-${PYSITELIB}/twisted/mail/mail.pyo
-${PYSITELIB}/twisted/mail/maildir.py
-${PYSITELIB}/twisted/mail/maildir.pyc
-${PYSITELIB}/twisted/mail/maildir.pyo
-${PYSITELIB}/twisted/mail/pb.py
-${PYSITELIB}/twisted/mail/pb.pyc
-${PYSITELIB}/twisted/mail/pb.pyo
-${PYSITELIB}/twisted/mail/pop3.py
-${PYSITELIB}/twisted/mail/pop3.pyc
-${PYSITELIB}/twisted/mail/pop3.pyo
-${PYSITELIB}/twisted/mail/pop3client.py
-${PYSITELIB}/twisted/mail/pop3client.pyc
-${PYSITELIB}/twisted/mail/pop3client.pyo
-${PYSITELIB}/twisted/mail/protocols.py
-${PYSITELIB}/twisted/mail/protocols.pyc
-${PYSITELIB}/twisted/mail/protocols.pyo
-${PYSITELIB}/twisted/mail/relay.py
-${PYSITELIB}/twisted/mail/relay.pyc
-${PYSITELIB}/twisted/mail/relay.pyo
-${PYSITELIB}/twisted/mail/relaymanager.py
-${PYSITELIB}/twisted/mail/relaymanager.pyc
-${PYSITELIB}/twisted/mail/relaymanager.pyo
-${PYSITELIB}/twisted/mail/scripts/__init__.py
-${PYSITELIB}/twisted/mail/scripts/__init__.pyc
-${PYSITELIB}/twisted/mail/scripts/__init__.pyo
-${PYSITELIB}/twisted/mail/scripts/mailmail.py
-${PYSITELIB}/twisted/mail/scripts/mailmail.pyc
-${PYSITELIB}/twisted/mail/scripts/mailmail.pyo
-${PYSITELIB}/twisted/mail/smtp.py
-${PYSITELIB}/twisted/mail/smtp.pyc
-${PYSITELIB}/twisted/mail/smtp.pyo
-${PYSITELIB}/twisted/mail/tap.py
-${PYSITELIB}/twisted/mail/tap.pyc
-${PYSITELIB}/twisted/mail/tap.pyo
-${PYSITELIB}/twisted/mail/test/__init__.py
-${PYSITELIB}/twisted/mail/test/__init__.pyc
-${PYSITELIB}/twisted/mail/test/__init__.pyo
-${PYSITELIB}/twisted/mail/test/pop3testserver.py
-${PYSITELIB}/twisted/mail/test/pop3testserver.pyc
-${PYSITELIB}/twisted/mail/test/pop3testserver.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/mail.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/mail.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/mail.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/maildir.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/maildir.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/maildir.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/pb.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/pb.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/pb.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/pop3.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/pop3.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/pop3.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/pop3client.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/pop3client.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/pop3client.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/protocols.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/protocols.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/protocols.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/relay.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/relay.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/relay.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/relaymanager.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/relaymanager.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/relaymanager.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/scripts/__init__.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/scripts/__init__.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/scripts/__init__.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/scripts/mailmail.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/scripts/mailmail.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/scripts/mailmail.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/smtp.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/smtp.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/smtp.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/tap.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/tap.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/tap.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/__init__.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/__init__.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/__init__.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/pop3testserver.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/pop3testserver.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/pop3testserver.pyo
 ${PYSITELIB}/twisted/mail/test/rfc822.message
-${PYSITELIB}/twisted/mail/test/server.pem
-${PYSITELIB}/twisted/mail/test/test_bounce.py
-${PYSITELIB}/twisted/mail/test/test_bounce.pyc
-${PYSITELIB}/twisted/mail/test/test_bounce.pyo
-${PYSITELIB}/twisted/mail/test/test_imap.py
-${PYSITELIB}/twisted/mail/test/test_imap.pyc
-${PYSITELIB}/twisted/mail/test/test_imap.pyo
-${PYSITELIB}/twisted/mail/test/test_mail.py
-${PYSITELIB}/twisted/mail/test/test_mail.pyc
-${PYSITELIB}/twisted/mail/test/test_mail.pyo
-${PYSITELIB}/twisted/mail/test/test_mailmail.py
-${PYSITELIB}/twisted/mail/test/test_mailmail.pyc
-${PYSITELIB}/twisted/mail/test/test_mailmail.pyo
-${PYSITELIB}/twisted/mail/test/test_options.py
-${PYSITELIB}/twisted/mail/test/test_options.pyc
-${PYSITELIB}/twisted/mail/test/test_options.pyo
-${PYSITELIB}/twisted/mail/test/test_pop3.py
-${PYSITELIB}/twisted/mail/test/test_pop3.pyc
-${PYSITELIB}/twisted/mail/test/test_pop3.pyo
-${PYSITELIB}/twisted/mail/test/test_pop3client.py
-${PYSITELIB}/twisted/mail/test/test_pop3client.pyc
-${PYSITELIB}/twisted/mail/test/test_pop3client.pyo
-${PYSITELIB}/twisted/mail/test/test_scripts.py
-${PYSITELIB}/twisted/mail/test/test_scripts.pyc
-${PYSITELIB}/twisted/mail/test/test_scripts.pyo
-${PYSITELIB}/twisted/mail/test/test_smtp.py
-${PYSITELIB}/twisted/mail/test/test_smtp.pyc
-${PYSITELIB}/twisted/mail/test/test_smtp.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_bounce.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_bounce.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_bounce.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_imap.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_imap.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_imap.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_mail.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_mail.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_mail.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_mailmail.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_mailmail.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_mailmail.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_options.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_options.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_options.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_pop3.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_pop3.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_pop3.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_pop3client.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_pop3client.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_pop3client.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_scripts.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_scripts.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_scripts.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_smtp.py
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_smtp.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_smtp.pyo
 ${PYSITELIB}/twisted/names/__init__.py
 ${PYSITELIB}/twisted/names/__init__.pyc
 ${PYSITELIB}/twisted/names/__init__.pyo
@@ -1060,33 +1077,33 @@ ${PYSITELIB}/twisted/names/test/test_tap.pyo
 ${PYSITELIB}/twisted/names/test/test_util.py
 ${PYSITELIB}/twisted/names/test/test_util.pyc
 ${PYSITELIB}/twisted/names/test/test_util.pyo
-${PYSITELIB}/twisted/news/__init__.py
-${PYSITELIB}/twisted/news/__init__.pyc
-${PYSITELIB}/twisted/news/__init__.pyo
-${PYSITELIB}/twisted/news/database.py
-${PYSITELIB}/twisted/news/database.pyc
-${PYSITELIB}/twisted/news/database.pyo
-${PYSITELIB}/twisted/news/news.py
-${PYSITELIB}/twisted/news/news.pyc
-${PYSITELIB}/twisted/news/news.pyo
-${PYSITELIB}/twisted/news/nntp.py
-${PYSITELIB}/twisted/news/nntp.pyc
-${PYSITELIB}/twisted/news/nntp.pyo
-${PYSITELIB}/twisted/news/tap.py
-${PYSITELIB}/twisted/news/tap.pyc
-${PYSITELIB}/twisted/news/tap.pyo
-${PYSITELIB}/twisted/news/test/__init__.py
-${PYSITELIB}/twisted/news/test/__init__.pyc
-${PYSITELIB}/twisted/news/test/__init__.pyo
-${PYSITELIB}/twisted/news/test/test_database.py
-${PYSITELIB}/twisted/news/test/test_database.pyc
-${PYSITELIB}/twisted/news/test/test_database.pyo
-${PYSITELIB}/twisted/news/test/test_news.py
-${PYSITELIB}/twisted/news/test/test_news.pyc
-${PYSITELIB}/twisted/news/test/test_news.pyo
-${PYSITELIB}/twisted/news/test/test_nntp.py
-${PYSITELIB}/twisted/news/test/test_nntp.pyc
-${PYSITELIB}/twisted/news/test/test_nntp.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/news/__init__.py
+${PLIST.py2x}${PYSITELIB}/twisted/news/__init__.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/news/__init__.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/news/database.py
+${PLIST.py2x}${PYSITELIB}/twisted/news/database.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/news/database.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/news/news.py
+${PLIST.py2x}${PYSITELIB}/twisted/news/news.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/news/news.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/news/nntp.py
+${PLIST.py2x}${PYSITELIB}/twisted/news/nntp.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/news/nntp.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/news/tap.py
+${PLIST.py2x}${PYSITELIB}/twisted/news/tap.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/news/tap.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/news/test/__init__.py
+${PLIST.py2x}${PYSITELIB}/twisted/news/test/__init__.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/news/test/__init__.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/news/test/test_database.py
+${PLIST.py2x}${PYSITELIB}/twisted/news/test/test_database.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/news/test/test_database.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/news/test/test_news.py
+${PLIST.py2x}${PYSITELIB}/twisted/news/test/test_news.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/news/test/test_news.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/news/test/test_nntp.py
+${PLIST.py2x}${PYSITELIB}/twisted/news/test/test_nntp.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/news/test/test_nntp.pyo
 ${PYSITELIB}/twisted/pair/__init__.py
 ${PYSITELIB}/twisted/pair/__init__.pyc
 ${PYSITELIB}/twisted/pair/__init__.pyo
@@ -1177,39 +1194,39 @@ ${PYSITELIB}/twisted/plugins/twisted_core.pyo
 ${PYSITELIB}/twisted/plugins/twisted_ftp.py
 ${PYSITELIB}/twisted/plugins/twisted_ftp.pyc
 ${PYSITELIB}/twisted/plugins/twisted_ftp.pyo
-${PYSITELIB}/twisted/plugins/twisted_inet.py
-${PYSITELIB}/twisted/plugins/twisted_inet.pyc
-${PYSITELIB}/twisted/plugins/twisted_inet.pyo
-${PYSITELIB}/twisted/plugins/twisted_mail.py
-${PYSITELIB}/twisted/plugins/twisted_mail.pyc
-${PYSITELIB}/twisted/plugins/twisted_mail.pyo
-${PYSITELIB}/twisted/plugins/twisted_names.py
-${PYSITELIB}/twisted/plugins/twisted_names.pyc
-${PYSITELIB}/twisted/plugins/twisted_names.pyo
-${PYSITELIB}/twisted/plugins/twisted_news.py
-${PYSITELIB}/twisted/plugins/twisted_news.pyc
-${PYSITELIB}/twisted/plugins/twisted_news.pyo
-${PYSITELIB}/twisted/plugins/twisted_portforward.py
-${PYSITELIB}/twisted/plugins/twisted_portforward.pyc
-${PYSITELIB}/twisted/plugins/twisted_portforward.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_inet.py
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_inet.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_inet.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_mail.py
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_mail.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_mail.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_names.py
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_names.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_names.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_news.py
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_news.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_news.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_portforward.py
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_portforward.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_portforward.pyo
 ${PYSITELIB}/twisted/plugins/twisted_reactors.py
 ${PYSITELIB}/twisted/plugins/twisted_reactors.pyc
 ${PYSITELIB}/twisted/plugins/twisted_reactors.pyo
-${PYSITELIB}/twisted/plugins/twisted_runner.py
-${PYSITELIB}/twisted/plugins/twisted_runner.pyc
-${PYSITELIB}/twisted/plugins/twisted_runner.pyo
-${PYSITELIB}/twisted/plugins/twisted_socks.py
-${PYSITELIB}/twisted/plugins/twisted_socks.pyc
-${PYSITELIB}/twisted/plugins/twisted_socks.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_runner.py
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_runner.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_runner.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_socks.py
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_socks.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_socks.pyo
 ${PYSITELIB}/twisted/plugins/twisted_trial.py
 ${PYSITELIB}/twisted/plugins/twisted_trial.pyc
 ${PYSITELIB}/twisted/plugins/twisted_trial.pyo
 ${PYSITELIB}/twisted/plugins/twisted_web.py
 ${PYSITELIB}/twisted/plugins/twisted_web.pyc
 ${PYSITELIB}/twisted/plugins/twisted_web.pyo
-${PYSITELIB}/twisted/plugins/twisted_words.py
-${PYSITELIB}/twisted/plugins/twisted_words.pyc
-${PYSITELIB}/twisted/plugins/twisted_words.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_words.py
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_words.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_words.pyo
 ${PYSITELIB}/twisted/positioning/__init__.py
 ${PYSITELIB}/twisted/positioning/__init__.pyc
 ${PYSITELIB}/twisted/positioning/__init__.pyo
@@ -1252,9 +1269,9 @@ ${PYSITELIB}/twisted/protocols/basic.pyo
 ${PYSITELIB}/twisted/protocols/dict.py
 ${PYSITELIB}/twisted/protocols/dict.pyc
 ${PYSITELIB}/twisted/protocols/dict.pyo
-${PYSITELIB}/twisted/protocols/finger.py
-${PYSITELIB}/twisted/protocols/finger.pyc
-${PYSITELIB}/twisted/protocols/finger.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/protocols/finger.py
+${PLIST.py2x}${PYSITELIB}/twisted/protocols/finger.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/protocols/finger.pyo
 ${PYSITELIB}/twisted/protocols/ftp.py
 ${PYSITELIB}/twisted/protocols/ftp.pyc
 ${PYSITELIB}/twisted/protocols/ftp.pyo
@@ -1300,21 +1317,21 @@ ${PYSITELIB}/twisted/protocols/haproxy/test/test_wrapper.pyo
 ${PYSITELIB}/twisted/protocols/htb.py
 ${PYSITELIB}/twisted/protocols/htb.pyc
 ${PYSITELIB}/twisted/protocols/htb.pyo
-${PYSITELIB}/twisted/protocols/ident.py
-${PYSITELIB}/twisted/protocols/ident.pyc
-${PYSITELIB}/twisted/protocols/ident.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/protocols/ident.py
+${PLIST.py2x}${PYSITELIB}/twisted/protocols/ident.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/protocols/ident.pyo
 ${PYSITELIB}/twisted/protocols/loopback.py
 ${PYSITELIB}/twisted/protocols/loopback.pyc
 ${PYSITELIB}/twisted/protocols/loopback.pyo
 ${PYSITELIB}/twisted/protocols/memcache.py
 ${PYSITELIB}/twisted/protocols/memcache.pyc
 ${PYSITELIB}/twisted/protocols/memcache.pyo
-${PYSITELIB}/twisted/protocols/mice/__init__.py
-${PYSITELIB}/twisted/protocols/mice/__init__.pyc
-${PYSITELIB}/twisted/protocols/mice/__init__.pyo
-${PYSITELIB}/twisted/protocols/mice/mouseman.py
-${PYSITELIB}/twisted/protocols/mice/mouseman.pyc
-${PYSITELIB}/twisted/protocols/mice/mouseman.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/protocols/mice/__init__.py
+${PLIST.py2x}${PYSITELIB}/twisted/protocols/mice/__init__.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/protocols/mice/__init__.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/protocols/mice/mouseman.py
+${PLIST.py2x}${PYSITELIB}/twisted/protocols/mice/mouseman.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/protocols/mice/mouseman.pyo
 ${PYSITELIB}/twisted/protocols/pcp.py
 ${PYSITELIB}/twisted/protocols/pcp.pyc
 ${PYSITELIB}/twisted/protocols/pcp.pyo
@@ -1327,9 +1344,9 @@ ${PYSITELIB}/twisted/protocols/portforward.pyo
 ${PYSITELIB}/twisted/protocols/postfix.py
 ${PYSITELIB}/twisted/protocols/postfix.pyc
 ${PYSITELIB}/twisted/protocols/postfix.pyo
-${PYSITELIB}/twisted/protocols/shoutcast.py
-${PYSITELIB}/twisted/protocols/shoutcast.pyc
-${PYSITELIB}/twisted/protocols/shoutcast.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/protocols/shoutcast.py
+${PLIST.py2x}${PYSITELIB}/twisted/protocols/shoutcast.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/protocols/shoutcast.pyo
 ${PYSITELIB}/twisted/protocols/sip.py
 ${PYSITELIB}/twisted/protocols/sip.pyc
 ${PYSITELIB}/twisted/protocols/sip.pyo
@@ -1339,9 +1356,6 @@ ${PYSITELIB}/twisted/protocols/socks.pyo
 ${PYSITELIB}/twisted/protocols/stateful.py
 ${PYSITELIB}/twisted/protocols/stateful.pyc
 ${PYSITELIB}/twisted/protocols/stateful.pyo
-${PYSITELIB}/twisted/protocols/telnet.py
-${PYSITELIB}/twisted/protocols/telnet.pyc
-${PYSITELIB}/twisted/protocols/telnet.pyo
 ${PYSITELIB}/twisted/protocols/test/__init__.py
 ${PYSITELIB}/twisted/protocols/test/__init__.pyc
 ${PYSITELIB}/twisted/protocols/test/__init__.pyo
@@ -1369,17 +1383,17 @@ ${PYSITELIB}/twisted/python/_inotify.pyo
 ${PYSITELIB}/twisted/python/_oldstyle.py
 ${PYSITELIB}/twisted/python/_oldstyle.pyc
 ${PYSITELIB}/twisted/python/_oldstyle.pyo
-${PYSITELIB}/twisted/python/_pydoctor.py
-${PYSITELIB}/twisted/python/_pydoctor.pyc
-${PYSITELIB}/twisted/python/_pydoctor.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/python/_pydoctor.py
+${PLIST.py2x}${PYSITELIB}/twisted/python/_pydoctor.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/python/_pydoctor.pyo
 ${PYSITELIB}/twisted/python/_pydoctortemplates/common.html
 ${PYSITELIB}/twisted/python/_pydoctortemplates/index.html
 ${PYSITELIB}/twisted/python/_pydoctortemplates/summary.html
-${PYSITELIB}/twisted/python/_release.py
-${PYSITELIB}/twisted/python/_release.pyc
-${PYSITELIB}/twisted/python/_release.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/python/_release.py
+${PLIST.py2x}${PYSITELIB}/twisted/python/_release.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/python/_release.pyo
 ${PYSITELIB}/twisted/python/_sendmsg.c
-${PYSITELIB}/twisted/python/_sendmsg.so
+${PLIST.py2x}${PYSITELIB}/twisted/python/_sendmsg.so
 ${PYSITELIB}/twisted/python/_setup.py
 ${PYSITELIB}/twisted/python/_setup.pyc
 ${PYSITELIB}/twisted/python/_setup.pyo
@@ -1419,15 +1433,15 @@ ${PYSITELIB}/twisted/python/fakepwd.pyo
 ${PYSITELIB}/twisted/python/filepath.py
 ${PYSITELIB}/twisted/python/filepath.pyc
 ${PYSITELIB}/twisted/python/filepath.pyo
-${PYSITELIB}/twisted/python/finalize.py
-${PYSITELIB}/twisted/python/finalize.pyc
-${PYSITELIB}/twisted/python/finalize.pyo
-${PYSITELIB}/twisted/python/formmethod.py
-${PYSITELIB}/twisted/python/formmethod.pyc
-${PYSITELIB}/twisted/python/formmethod.pyo
-${PYSITELIB}/twisted/python/hook.py
-${PYSITELIB}/twisted/python/hook.pyc
-${PYSITELIB}/twisted/python/hook.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/python/finalize.py
+${PLIST.py2x}${PYSITELIB}/twisted/python/finalize.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/python/finalize.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/python/formmethod.py
+${PLIST.py2x}${PYSITELIB}/twisted/python/formmethod.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/python/formmethod.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/python/hook.py
+${PLIST.py2x}${PYSITELIB}/twisted/python/hook.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/python/hook.pyo
 ${PYSITELIB}/twisted/python/htmlizer.py
 ${PYSITELIB}/twisted/python/htmlizer.pyc
 ${PYSITELIB}/twisted/python/htmlizer.pyo
@@ -1452,15 +1466,15 @@ ${PYSITELIB}/twisted/python/procutils.pyo
 ${PYSITELIB}/twisted/python/randbytes.py
 ${PYSITELIB}/twisted/python/randbytes.pyc
 ${PYSITELIB}/twisted/python/randbytes.pyo
-${PYSITELIB}/twisted/python/rebuild.py
-${PYSITELIB}/twisted/python/rebuild.pyc
-${PYSITELIB}/twisted/python/rebuild.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/python/rebuild.py
+${PLIST.py2x}${PYSITELIB}/twisted/python/rebuild.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/python/rebuild.pyo
 ${PYSITELIB}/twisted/python/reflect.py
 ${PYSITELIB}/twisted/python/reflect.pyc
 ${PYSITELIB}/twisted/python/reflect.pyo
-${PYSITELIB}/twisted/python/release.py
-${PYSITELIB}/twisted/python/release.pyc
-${PYSITELIB}/twisted/python/release.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/python/release.py
+${PLIST.py2x}${PYSITELIB}/twisted/python/release.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/python/release.pyo
 ${PYSITELIB}/twisted/python/roots.py
 ${PYSITELIB}/twisted/python/roots.pyc
 ${PYSITELIB}/twisted/python/roots.pyo
@@ -1470,9 +1484,9 @@ ${PYSITELIB}/twisted/python/runtime.pyo
 ${PYSITELIB}/twisted/python/sendmsg.py
 ${PYSITELIB}/twisted/python/sendmsg.pyc
 ${PYSITELIB}/twisted/python/sendmsg.pyo
-${PYSITELIB}/twisted/python/shortcut.py
-${PYSITELIB}/twisted/python/shortcut.pyc
-${PYSITELIB}/twisted/python/shortcut.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/python/shortcut.py
+${PLIST.py2x}${PYSITELIB}/twisted/python/shortcut.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/python/shortcut.pyo
 ${PYSITELIB}/twisted/python/syslog.py
 ${PYSITELIB}/twisted/python/syslog.pyc
 ${PYSITELIB}/twisted/python/syslog.pyo
@@ -1482,9 +1496,9 @@ ${PYSITELIB}/twisted/python/systemd.pyo
 ${PYSITELIB}/twisted/python/test/__init__.py
 ${PYSITELIB}/twisted/python/test/__init__.pyc
 ${PYSITELIB}/twisted/python/test/__init__.pyo
-${PYSITELIB}/twisted/python/test/cmodulepullpipe.py
-${PYSITELIB}/twisted/python/test/cmodulepullpipe.pyc
-${PYSITELIB}/twisted/python/test/cmodulepullpipe.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/python/test/cmodulepullpipe.py
+${PLIST.py2x}${PYSITELIB}/twisted/python/test/cmodulepullpipe.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/python/test/cmodulepullpipe.pyo
 ${PYSITELIB}/twisted/python/test/deprecatedattributes.py
 ${PYSITELIB}/twisted/python/test/deprecatedattributes.pyc
 ${PYSITELIB}/twisted/python/test/deprecatedattributes.pyo
@@ -1509,21 +1523,21 @@ ${PYSITELIB}/twisted/python/test/test_deprecate.pyo
 ${PYSITELIB}/twisted/python/test/test_dist3.py
 ${PYSITELIB}/twisted/python/test/test_dist3.pyc
 ${PYSITELIB}/twisted/python/test/test_dist3.pyo
-${PYSITELIB}/twisted/python/test/test_fakepwd.py
-${PYSITELIB}/twisted/python/test/test_fakepwd.pyc
-${PYSITELIB}/twisted/python/test/test_fakepwd.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/python/test/test_fakepwd.py
+${PLIST.py2x}${PYSITELIB}/twisted/python/test/test_fakepwd.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/python/test/test_fakepwd.pyo
 ${PYSITELIB}/twisted/python/test/test_htmlizer.py
 ${PYSITELIB}/twisted/python/test/test_htmlizer.pyc
 ${PYSITELIB}/twisted/python/test/test_htmlizer.pyo
 ${PYSITELIB}/twisted/python/test/test_inotify.py
 ${PYSITELIB}/twisted/python/test/test_inotify.pyc
 ${PYSITELIB}/twisted/python/test/test_inotify.pyo
-${PYSITELIB}/twisted/python/test/test_pydoctor.py
-${PYSITELIB}/twisted/python/test/test_pydoctor.pyc
-${PYSITELIB}/twisted/python/test/test_pydoctor.pyo
-${PYSITELIB}/twisted/python/test/test_release.py
-${PYSITELIB}/twisted/python/test/test_release.pyc
-${PYSITELIB}/twisted/python/test/test_release.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/python/test/test_pydoctor.py
+${PLIST.py2x}${PYSITELIB}/twisted/python/test/test_pydoctor.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/python/test/test_pydoctor.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/python/test/test_release.py
+${PLIST.py2x}${PYSITELIB}/twisted/python/test/test_release.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/python/test/test_release.pyo
 ${PYSITELIB}/twisted/python/test/test_runtime.py
 ${PYSITELIB}/twisted/python/test/test_runtime.pyc
 ${PYSITELIB}/twisted/python/test/test_runtime.pyo
@@ -1560,9 +1574,9 @@ ${PYSITELIB}/twisted/python/test/test_util.pyo
 ${PYSITELIB}/twisted/python/test/test_versions.py
 ${PYSITELIB}/twisted/python/test/test_versions.pyc
 ${PYSITELIB}/twisted/python/test/test_versions.pyo
-${PYSITELIB}/twisted/python/test/test_win32.py
-${PYSITELIB}/twisted/python/test/test_win32.pyc
-${PYSITELIB}/twisted/python/test/test_win32.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/python/test/test_win32.py
+${PLIST.py2x}${PYSITELIB}/twisted/python/test/test_win32.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/python/test/test_win32.pyo
 ${PYSITELIB}/twisted/python/test/test_zippath.py
 ${PYSITELIB}/twisted/python/test/test_zippath.pyc
 ${PYSITELIB}/twisted/python/test/test_zippath.pyo
@@ -1616,7 +1630,7 @@ ${PYSITELIB}/twisted/runner/inetdtap.py
 ${PYSITELIB}/twisted/runner/inetdtap.pyc
 ${PYSITELIB}/twisted/runner/inetdtap.pyo
 ${PYSITELIB}/twisted/runner/portmap.c
-${PYSITELIB}/twisted/runner/portmap.so
+${PLIST.py2x}${PYSITELIB}/twisted/runner/portmap.so
 ${PYSITELIB}/twisted/runner/procmon.py
 ${PYSITELIB}/twisted/runner/procmon.pyc
 ${PYSITELIB}/twisted/runner/procmon.pyo
@@ -1701,36 +1715,36 @@ ${PYSITELIB}/twisted/spread/test/test_pbfailure.pyo
 ${PYSITELIB}/twisted/spread/util.py
 ${PYSITELIB}/twisted/spread/util.pyc
 ${PYSITELIB}/twisted/spread/util.pyo
-${PYSITELIB}/twisted/tap/__init__.py
-${PYSITELIB}/twisted/tap/__init__.pyc
-${PYSITELIB}/twisted/tap/__init__.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/tap/__init__.py
+${PLIST.py2x}${PYSITELIB}/twisted/tap/__init__.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/tap/__init__.pyo
 ${PYSITELIB}/twisted/tap/ftp.py
 ${PYSITELIB}/twisted/tap/ftp.pyc
 ${PYSITELIB}/twisted/tap/ftp.pyo
-${PYSITELIB}/twisted/tap/portforward.py
-${PYSITELIB}/twisted/tap/portforward.pyc
-${PYSITELIB}/twisted/tap/portforward.pyo
-${PYSITELIB}/twisted/tap/socks.py
-${PYSITELIB}/twisted/tap/socks.pyc
-${PYSITELIB}/twisted/tap/socks.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/tap/portforward.py
+${PLIST.py2x}${PYSITELIB}/twisted/tap/portforward.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/tap/portforward.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/tap/socks.py
+${PLIST.py2x}${PYSITELIB}/twisted/tap/socks.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/tap/socks.pyo
 ${PYSITELIB}/twisted/test/__init__.py
 ${PYSITELIB}/twisted/test/__init__.pyc
 ${PYSITELIB}/twisted/test/__init__.pyo
-${PYSITELIB}/twisted/test/crash_test_dummy.py
-${PYSITELIB}/twisted/test/crash_test_dummy.pyc
-${PYSITELIB}/twisted/test/crash_test_dummy.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/test/crash_test_dummy.py
+${PLIST.py2x}${PYSITELIB}/twisted/test/crash_test_dummy.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/test/crash_test_dummy.pyo
 ${PYSITELIB}/twisted/test/iosim.py
 ${PYSITELIB}/twisted/test/iosim.pyc
 ${PYSITELIB}/twisted/test/iosim.pyo
 ${PYSITELIB}/twisted/test/mock_win32process.py
 ${PYSITELIB}/twisted/test/mock_win32process.pyc
 ${PYSITELIB}/twisted/test/mock_win32process.pyo
-${PYSITELIB}/twisted/test/myrebuilder1.py
-${PYSITELIB}/twisted/test/myrebuilder1.pyc
-${PYSITELIB}/twisted/test/myrebuilder1.pyo
-${PYSITELIB}/twisted/test/myrebuilder2.py
-${PYSITELIB}/twisted/test/myrebuilder2.pyc
-${PYSITELIB}/twisted/test/myrebuilder2.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/test/myrebuilder1.py
+${PLIST.py2x}${PYSITELIB}/twisted/test/myrebuilder1.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/test/myrebuilder1.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/test/myrebuilder2.py
+${PLIST.py2x}${PYSITELIB}/twisted/test/myrebuilder2.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/test/myrebuilder2.pyo
 ${PYSITELIB}/twisted/test/plugin_basic.py
 ${PYSITELIB}/twisted/test/plugin_basic.pyc
 ${PYSITELIB}/twisted/test/plugin_basic.pyo
@@ -1864,27 +1878,27 @@ ${PYSITELIB}/twisted/test/test_failure.pyo
 ${PYSITELIB}/twisted/test/test_fdesc.py
 ${PYSITELIB}/twisted/test/test_fdesc.pyc
 ${PYSITELIB}/twisted/test/test_fdesc.pyo
-${PYSITELIB}/twisted/test/test_finger.py
-${PYSITELIB}/twisted/test/test_finger.pyc
-${PYSITELIB}/twisted/test/test_finger.pyo
-${PYSITELIB}/twisted/test/test_formmethod.py
-${PYSITELIB}/twisted/test/test_formmethod.pyc
-${PYSITELIB}/twisted/test/test_formmethod.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_finger.py
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_finger.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_finger.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_formmethod.py
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_formmethod.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_formmethod.pyo
 ${PYSITELIB}/twisted/test/test_ftp.py
 ${PYSITELIB}/twisted/test/test_ftp.pyc
 ${PYSITELIB}/twisted/test/test_ftp.pyo
 ${PYSITELIB}/twisted/test/test_ftp_options.py
 ${PYSITELIB}/twisted/test/test_ftp_options.pyc
 ${PYSITELIB}/twisted/test/test_ftp_options.pyo
-${PYSITELIB}/twisted/test/test_hook.py
-${PYSITELIB}/twisted/test/test_hook.pyc
-${PYSITELIB}/twisted/test/test_hook.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_hook.py
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_hook.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_hook.pyo
 ${PYSITELIB}/twisted/test/test_htb.py
 ${PYSITELIB}/twisted/test/test_htb.pyc
 ${PYSITELIB}/twisted/test/test_htb.pyo
-${PYSITELIB}/twisted/test/test_ident.py
-${PYSITELIB}/twisted/test/test_ident.pyc
-${PYSITELIB}/twisted/test/test_ident.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_ident.py
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_ident.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_ident.pyo
 ${PYSITELIB}/twisted/test/test_internet.py
 ${PYSITELIB}/twisted/test/test_internet.pyc
 ${PYSITELIB}/twisted/test/test_internet.pyo
@@ -1948,18 +1962,18 @@ ${PYSITELIB}/twisted/test/test_protocols.pyo
 ${PYSITELIB}/twisted/test/test_randbytes.py
 ${PYSITELIB}/twisted/test/test_randbytes.pyc
 ${PYSITELIB}/twisted/test/test_randbytes.pyo
-${PYSITELIB}/twisted/test/test_rebuild.py
-${PYSITELIB}/twisted/test/test_rebuild.pyc
-${PYSITELIB}/twisted/test/test_rebuild.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_rebuild.py
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_rebuild.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_rebuild.pyo
 ${PYSITELIB}/twisted/test/test_reflect.py
 ${PYSITELIB}/twisted/test/test_reflect.pyc
 ${PYSITELIB}/twisted/test/test_reflect.pyo
 ${PYSITELIB}/twisted/test/test_roots.py
 ${PYSITELIB}/twisted/test/test_roots.pyc
 ${PYSITELIB}/twisted/test/test_roots.pyo
-${PYSITELIB}/twisted/test/test_shortcut.py
-${PYSITELIB}/twisted/test/test_shortcut.pyc
-${PYSITELIB}/twisted/test/test_shortcut.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_shortcut.py
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_shortcut.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_shortcut.pyo
 ${PYSITELIB}/twisted/test/test_sip.py
 ${PYSITELIB}/twisted/test/test_sip.pyc
 ${PYSITELIB}/twisted/test/test_sip.pyo
@@ -1981,9 +1995,9 @@ ${PYSITELIB}/twisted/test/test_stateful.pyo
 ${PYSITELIB}/twisted/test/test_stdio.py
 ${PYSITELIB}/twisted/test/test_stdio.pyc
 ${PYSITELIB}/twisted/test/test_stdio.pyo
-${PYSITELIB}/twisted/test/test_strerror.py
-${PYSITELIB}/twisted/test/test_strerror.pyc
-${PYSITELIB}/twisted/test/test_strerror.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_strerror.py
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_strerror.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/test/test_strerror.pyo
 ${PYSITELIB}/twisted/test/test_stringtransport.py
 ${PYSITELIB}/twisted/test/test_stringtransport.pyc
 ${PYSITELIB}/twisted/test/test_stringtransport.pyo
@@ -2254,12 +2268,12 @@ ${PYSITELIB}/twisted/web/client.pyo
 ${PYSITELIB}/twisted/web/demo.py
 ${PYSITELIB}/twisted/web/demo.pyc
 ${PYSITELIB}/twisted/web/demo.pyo
-${PYSITELIB}/twisted/web/distrib.py
-${PYSITELIB}/twisted/web/distrib.pyc
-${PYSITELIB}/twisted/web/distrib.pyo
-${PYSITELIB}/twisted/web/domhelpers.py
-${PYSITELIB}/twisted/web/domhelpers.pyc
-${PYSITELIB}/twisted/web/domhelpers.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/web/distrib.py
+${PLIST.py2x}${PYSITELIB}/twisted/web/distrib.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/web/distrib.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/web/domhelpers.py
+${PLIST.py2x}${PYSITELIB}/twisted/web/domhelpers.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/web/domhelpers.pyo
 ${PYSITELIB}/twisted/web/error.py
 ${PYSITELIB}/twisted/web/error.pyc
 ${PYSITELIB}/twisted/web/error.pyo
@@ -2278,33 +2292,33 @@ ${PYSITELIB}/twisted/web/http_headers.pyo
 ${PYSITELIB}/twisted/web/iweb.py
 ${PYSITELIB}/twisted/web/iweb.pyc
 ${PYSITELIB}/twisted/web/iweb.pyo
-${PYSITELIB}/twisted/web/microdom.py
-${PYSITELIB}/twisted/web/microdom.pyc
-${PYSITELIB}/twisted/web/microdom.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/web/microdom.py
+${PLIST.py2x}${PYSITELIB}/twisted/web/microdom.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/web/microdom.pyo
 ${PYSITELIB}/twisted/web/proxy.py
 ${PYSITELIB}/twisted/web/proxy.pyc
 ${PYSITELIB}/twisted/web/proxy.pyo
 ${PYSITELIB}/twisted/web/resource.py
 ${PYSITELIB}/twisted/web/resource.pyc
 ${PYSITELIB}/twisted/web/resource.pyo
-${PYSITELIB}/twisted/web/rewrite.py
-${PYSITELIB}/twisted/web/rewrite.pyc
-${PYSITELIB}/twisted/web/rewrite.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/web/rewrite.py
+${PLIST.py2x}${PYSITELIB}/twisted/web/rewrite.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/web/rewrite.pyo
 ${PYSITELIB}/twisted/web/script.py
 ${PYSITELIB}/twisted/web/script.pyc
 ${PYSITELIB}/twisted/web/script.pyo
 ${PYSITELIB}/twisted/web/server.py
 ${PYSITELIB}/twisted/web/server.pyc
 ${PYSITELIB}/twisted/web/server.pyo
-${PYSITELIB}/twisted/web/soap.py
-${PYSITELIB}/twisted/web/soap.pyc
-${PYSITELIB}/twisted/web/soap.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/web/soap.py
+${PLIST.py2x}${PYSITELIB}/twisted/web/soap.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/web/soap.pyo
 ${PYSITELIB}/twisted/web/static.py
 ${PYSITELIB}/twisted/web/static.pyc
 ${PYSITELIB}/twisted/web/static.pyo
-${PYSITELIB}/twisted/web/sux.py
-${PYSITELIB}/twisted/web/sux.pyc
-${PYSITELIB}/twisted/web/sux.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/web/sux.py
+${PLIST.py2x}${PYSITELIB}/twisted/web/sux.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/web/sux.pyo
 ${PYSITELIB}/twisted/web/tap.py
 ${PYSITELIB}/twisted/web/tap.pyc
 ${PYSITELIB}/twisted/web/tap.pyo
@@ -2323,24 +2337,24 @@ ${PYSITELIB}/twisted/web/test/requesthelper.pyo
 ${PYSITELIB}/twisted/web/test/test_agent.py
 ${PYSITELIB}/twisted/web/test/test_agent.pyc
 ${PYSITELIB}/twisted/web/test/test_agent.pyo
-${PYSITELIB}/twisted/web/test/test_cgi.py
-${PYSITELIB}/twisted/web/test/test_cgi.pyc
-${PYSITELIB}/twisted/web/test/test_cgi.pyo
-${PYSITELIB}/twisted/web/test/test_distrib.py
-${PYSITELIB}/twisted/web/test/test_distrib.pyc
-${PYSITELIB}/twisted/web/test/test_distrib.pyo
-${PYSITELIB}/twisted/web/test/test_domhelpers.py
-${PYSITELIB}/twisted/web/test/test_domhelpers.pyc
-${PYSITELIB}/twisted/web/test/test_domhelpers.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_cgi.py
+${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_cgi.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_cgi.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_distrib.py
+${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_distrib.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_distrib.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_domhelpers.py
+${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_domhelpers.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_domhelpers.pyo
 ${PYSITELIB}/twisted/web/test/test_error.py
 ${PYSITELIB}/twisted/web/test/test_error.pyc
 ${PYSITELIB}/twisted/web/test/test_error.pyo
 ${PYSITELIB}/twisted/web/test/test_flatten.py
 ${PYSITELIB}/twisted/web/test/test_flatten.pyc
 ${PYSITELIB}/twisted/web/test/test_flatten.pyo
-${PYSITELIB}/twisted/web/test/test_html.py
-${PYSITELIB}/twisted/web/test/test_html.pyc
-${PYSITELIB}/twisted/web/test/test_html.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_html.py
+${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_html.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_html.pyo
 ${PYSITELIB}/twisted/web/test/test_http.py
 ${PYSITELIB}/twisted/web/test/test_http.pyc
 ${PYSITELIB}/twisted/web/test/test_http.pyo
@@ -2365,9 +2379,9 @@ ${PYSITELIB}/twisted/web/test/test_resource.pyo
 ${PYSITELIB}/twisted/web/test/test_script.py
 ${PYSITELIB}/twisted/web/test/test_script.pyc
 ${PYSITELIB}/twisted/web/test/test_script.pyo
-${PYSITELIB}/twisted/web/test/test_soap.py
-${PYSITELIB}/twisted/web/test/test_soap.pyc
-${PYSITELIB}/twisted/web/test/test_soap.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_soap.py
+${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_soap.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_soap.pyo
 ${PYSITELIB}/twisted/web/test/test_stan.py
 ${PYSITELIB}/twisted/web/test/test_stan.pyc
 ${PYSITELIB}/twisted/web/test/test_stan.pyo
@@ -2398,15 +2412,15 @@ ${PYSITELIB}/twisted/web/test/test_webclient.pyo
 ${PYSITELIB}/twisted/web/test/test_wsgi.py
 ${PYSITELIB}/twisted/web/test/test_wsgi.pyc
 ${PYSITELIB}/twisted/web/test/test_wsgi.pyo
-${PYSITELIB}/twisted/web/test/test_xml.py
-${PYSITELIB}/twisted/web/test/test_xml.pyc
-${PYSITELIB}/twisted/web/test/test_xml.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_xml.py
+${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_xml.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_xml.pyo
 ${PYSITELIB}/twisted/web/test/test_xmlrpc.py
 ${PYSITELIB}/twisted/web/test/test_xmlrpc.pyc
 ${PYSITELIB}/twisted/web/test/test_xmlrpc.pyo
-${PYSITELIB}/twisted/web/twcgi.py
-${PYSITELIB}/twisted/web/twcgi.pyc
-${PYSITELIB}/twisted/web/twcgi.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/web/twcgi.py
+${PLIST.py2x}${PYSITELIB}/twisted/web/twcgi.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/web/twcgi.pyo
 ${PYSITELIB}/twisted/web/util.py
 ${PYSITELIB}/twisted/web/util.pyc
 ${PYSITELIB}/twisted/web/util.pyo
@@ -2492,15 +2506,15 @@ ${PYSITELIB}/twisted/words/protocols/jabber/xmlstream.pyo
 ${PYSITELIB}/twisted/words/protocols/jabber/xmpp_stringprep.py
 ${PYSITELIB}/twisted/words/protocols/jabber/xmpp_stringprep.pyc
 ${PYSITELIB}/twisted/words/protocols/jabber/xmpp_stringprep.pyo
-${PYSITELIB}/twisted/words/protocols/oscar.py
-${PYSITELIB}/twisted/words/protocols/oscar.pyc
-${PYSITELIB}/twisted/words/protocols/oscar.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/words/protocols/oscar.py
+${PLIST.py2x}${PYSITELIB}/twisted/words/protocols/oscar.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/words/protocols/oscar.pyo
 ${PYSITELIB}/twisted/words/service.py
 ${PYSITELIB}/twisted/words/service.pyc
 ${PYSITELIB}/twisted/words/service.pyo
-${PYSITELIB}/twisted/words/tap.py
-${PYSITELIB}/twisted/words/tap.pyc
-${PYSITELIB}/twisted/words/tap.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/words/tap.py
+${PLIST.py2x}${PYSITELIB}/twisted/words/tap.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/words/tap.pyo
 ${PYSITELIB}/twisted/words/test/__init__.py
 ${PYSITELIB}/twisted/words/test/__init__.pyc
 ${PYSITELIB}/twisted/words/test/__init__.pyo
@@ -2549,15 +2563,15 @@ ${PYSITELIB}/twisted/words/test/test_jabberxmlstream.pyo
 ${PYSITELIB}/twisted/words/test/test_jabberxmppstringprep.py
 ${PYSITELIB}/twisted/words/test/test_jabberxmppstringprep.pyc
 ${PYSITELIB}/twisted/words/test/test_jabberxmppstringprep.pyo
-${PYSITELIB}/twisted/words/test/test_oscar.py
-${PYSITELIB}/twisted/words/test/test_oscar.pyc
-${PYSITELIB}/twisted/words/test/test_oscar.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/words/test/test_oscar.py
+${PLIST.py2x}${PYSITELIB}/twisted/words/test/test_oscar.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/words/test/test_oscar.pyo
 ${PYSITELIB}/twisted/words/test/test_service.py
 ${PYSITELIB}/twisted/words/test/test_service.pyc
 ${PYSITELIB}/twisted/words/test/test_service.pyo
-${PYSITELIB}/twisted/words/test/test_tap.py
-${PYSITELIB}/twisted/words/test/test_tap.pyc
-${PYSITELIB}/twisted/words/test/test_tap.pyo
+${PLIST.py2x}${PYSITELIB}/twisted/words/test/test_tap.py
+${PLIST.py2x}${PYSITELIB}/twisted/words/test/test_tap.pyc
+${PLIST.py2x}${PYSITELIB}/twisted/words/test/test_tap.pyo
 ${PYSITELIB}/twisted/words/test/test_xishutil.py
 ${PYSITELIB}/twisted/words/test/test_xishutil.pyc
 ${PYSITELIB}/twisted/words/test/test_xishutil.pyo
diff --git a/net/py-twisted/distinfo b/net/py-twisted/distinfo
index 629729c27b3..12d09df6b13 100644
--- a/net/py-twisted/distinfo
+++ b/net/py-twisted/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.31 2016/11/28 13:55:50 wiz Exp $
+$NetBSD: distinfo,v 1.32 2017/02/13 18:59:04 adam Exp $
 
-SHA1 (Twisted-16.6.0.tar.bz2) = 57ea06c54e59c314f904870946c4a3586d7b86ea
-RMD160 (Twisted-16.6.0.tar.bz2) = 28cb89fd05e68a2574e69f22284c54bee4503a7b
-SHA512 (Twisted-16.6.0.tar.bz2) = 0b8de0ec7f64457f76c396fced64b366b8e63c6e000a5edc6c6388cd917fb2f95711918cd8edda39e0aa77e2cd32b5d775d23630a5ad10fc013c18f8316300cf
-Size (Twisted-16.6.0.tar.bz2) = 2979747 bytes
+SHA1 (Twisted-17.1.0.tar.bz2) = 1cd9e3e39323f555a89d882cbbcf001015bd3113
+RMD160 (Twisted-17.1.0.tar.bz2) = ce9ce8386a05395b81297029b66680dc07b559eb
+SHA512 (Twisted-17.1.0.tar.bz2) = e5eedc9a70b7e4d0ec18dddaa82aa9a784e96fd517db65c278d822d15e8bdc65a35307a5a0474eb68dcb73fcd5508086bec605580a9f2f767bcbe27d714b4966
+Size (Twisted-17.1.0.tar.bz2) = 2997334 bytes
 SHA1 (patch-src_twisted_runner_portmap.c) = b3bd85bfa067bdb7050e83eeff53da83b3e6b998