Update to 12.3.0. Upstream NEWS, less bugfixes and "other", follows:

Twisted Core 12.3.0 (2012-12-20)
================================

Features
--------
 - The new -j flag to trial provides a trial runner supporting
   multiple worker processes on the local machine, for parallel
   testing. (#1784)
 - twisted.internet.task.react, a new function, provides a simple API
   for running the reactor until a single asynchronous function
   completes. (#3270)
 - twisted.protocols.ftp.FTP now handles FEAT and OPTS commands.
   (#4515)
 - trial now supports specifying a debugger other than pdb with the
   --debugger command line flag. (#5794)
 - twisted.python.util.runWithWarningsSuppressed has been added; it
   runs a function with specified warning filters. (#5950)
 - trial's skipping feature is now implemented in a way compatible with the
   standard library unittest's runner. (#6006)
 - The setup3.py script is now provided to provisionally support
   building and installing an experimental, incomplete version of
   Twisted in a Python 3 environment. (#6040)
 - twisted.python.util.FancyStrMixin now supports arbitrary callables
   to format attribute values. (#6063)
 - Several new methods of twisted.trial.unittest.SynchronousTestCase
   - `successResultOf`, `failureResultOf`, and `assertNoResult` -
   have been added to make testing `Deferred`-using code easier.
   (#6105)

Deprecations and Removals
-------------------------
 - The minimum required version of zope.interface is now 3.6.0.
   (#5683)
 - twisted.internet.interfaces.IReactorArbitrary and
   twisted.application.internet.GenericServer and GenericClient,
   deprecated since Twisted 10.1, have been removed. (#5943)
 - twisted.internet.interfaces.IFinishableConsumer, deprecated since
   Twisted 11.1, has been removed. (#5944)
 - twisted.python.failure has removed all support for string
   exceptions. (#5948)
 - assertTrue, assertEqual, and the other free-functions in
   twisted.trial.unittest for writing assertions, deprecated since
   prior to Twisted 2.3, have been removed. (#5963)
 - Ports, connectors, wakers and other reactor-related types no longer
   log a nice warning when they are erroneously pickled. Pickling of
   such objects continues to be unsupported. (#5979)
 - twisted.python.components.Componentized no longer inherits from
   Versioned. (#5983)
 - twisted.protocols.basic.NetstringReceiver.sendString no longer
   accepts objects other than bytes; the removed behavior was
   deprecated in Twisted 10.0. (#6025)
 - The lookupRecord method of twisted.internet.interfaces.IResolver,
   never implemented or called by Twisted, has been removed. (#6091)


Twisted Names 12.3.0 (2012-12-20)
=================================

Deprecations and Removals
-------------------------
 - The `protocol` attribute of twisted.names.client.Resolver,
   deprecated since Twisted 8.2, has been removed. (#6045)
 - twisted.names.hosts.Resolver is no longer a
   `twisted.persisted.styles.Versioned` subclass. (#6092)


Twisted Web 12.3.0 (2012-12-20)
===============================

Features
--------
 - twisted.web.server.Site now supports an encoders argument to encode
   request content, twisted.web.server.GzipEncoderFactory being the
   first one provided. (#104)


Twisted Core 12.2.0 (2012-08-26)
================================

Features
--------
 - twisted.protocols.sip.MessageParser now handles multiline headers.
   (#2198)
 - twisted.internet.endpoints now provides StandardIOEndpoint, a
   Standard I/O endpoint. (#4697)
 - If a FTPCmdError occurs during twisted.protocols.ftp.FTP.ftp_RETR
   sending the file (i.e. it is raised by the IReadFile.send method it
   invokes), then it will use that to return an error to the client
   rather than necessarily sending a 426 CNX_CLOSED_TXFR_ABORTED
   error. (#4913)
 - twisted.internet.interfaces.IReactorSocket.adoptStreamConnection is
   implemented by some reactors as a way to add an existing
   established connection to them. (#5570)
 - twisted.internet.endpoints now provides TCP6ServerEndpoint, an IPv6
   TCP server endpoint. (#5694)
 - twisted.internet.endpoints now provides TCP6ClientEndpoint, an IPv6
   TCP client endpoint. (#5695)
 - twisted.internet.endpoints.serverFromString, the endpoint string
   description feature, can now be used to create IPv6 TCP servers.
   (#5699)
 - twisted.internet.endpoints.serverFromString, the endpoint string
   description feature, can now be used to create servers that run on
   Standard I/O. (#5729)
 - twisted.trial.unittest now offers SynchronousTestCase, a test case
   base class that provides usability improvements but not reactor-
   based testing features. (#5853)


Twisted Conch 12.2.0 (2012-08-26)
=================================

Features
--------
 - twisted.conch.ssh.transport.SSHTransport now returns an
   SSHTransportAddress from the getPeer() and getHost() methods.
   (#2997)


Twisted Mail 12.2.0 (2012-08-26)
================================

Deprecations and Removals
-------------------------
 - twisted.mail.protocols.SSLContextFactory is now deprecated. (#4963)
 - The --passwordfile option to twistd mail is now removed. (#5541)


Twisted Names 12.2.0 (2012-08-26)
=================================

Features
--------
 - twisted.names.srvconnect.SRVConnector now takes a default port to
   use when SRV lookup fails. (#3456)


Twisted Web 12.2.0 (2012-08-26)
===============================

Deprecations and Removals
-------------------------
 - twisted.web.static.FileTransfer, deprecated since 9.0, is removed
   now. Use a subclass of StaticProducer instead. (#5651)
 - ErrorPage, NoResource and ForbiddenResource in twisted.web.error
   were deprecated since 9.0 and are removed now. (#5659)
 - twisted.web.google, deprecated since Twisted 11.1, is removed now.
   (#5768)


Twisted Core 12.1.0 (2012-06-02)
================================

Features
--------
 - The kqueue reactor has been revived. (#1918)
 - twisted.python.filepath now provides IFilePath, an interface for
   file path objects. (#2176)
 - New gtk3 and gobject-introspection reactors have been added.
   (#4558)
 - gtk and glib reactors now run I/O and scheduled events with lower
   priority, to ensure the UI stays responsive. (#5067)
 - IReactorTCP.connectTCP() can now accept IPv6 address literals
   (although not hostnames) in order to support connecting to IPv6
   hosts. (#5085)
 - twisted.internet.interfaces.IReactorSocket, a new interface, is now
   supported by some reactors to listen on sockets set up by external
   software (eg systemd or launchd). (#5248)
 - twisted.internet.endpoints.clientFromString now also supports
   strings in the form of tcp:example.com:80 and ssl:example.com:4321
   (#5358)
 - twisted.python.constants.Flags now provides a way to define
   collections of flags for bitvector-type uses. (#5384)
 - The epoll(7)-based reactor is now the default reactor on Linux.
   (#5478)
 - twisted.python.runtime.platform.isLinux can be used to check if
   Twisted is running on Linux. (#5491)
 - twisted.internet.endpoints.serverFromString now recognizes a
   "systemd" endpoint type, for listening on a server port inherited
   from systemd. (#5575)
 - Connections created using twisted.internet.interfaces.IReactorUNIX
   now support sending and receiving file descriptors between
   different processes. (#5615)
 - twisted.internet.endpoints.clientFromString now supports UNIX
   client endpoint strings with the path argument specified like
   "unix:/foo/bar" in addition to the old style, "unix:path=/foo/bar".
   (#5640)
 - twisted.protocols.amp.Descriptor is a new AMP argument type which
   supports passing file descriptors as AMP command arguments over
   UNIX connections. (#5650)

Deprecations and Removals
-------------------------
 - The 'unsigned' flag to twisted.scripts.tap2rpm.MyOptions is now
   deprecated.  (#4086)
 - Removed the unreachable _fileUrandom method from
   twisted.python.randbytes.RandomFactory. (#4530)
 - twisted.persisted.journal is removed, deprecated since Twisted
   11.0. (#4805)
 - Support for pyOpenSSL 0.9 and older is now deprecated.  pyOpenSSL
   0.10 or newer will soon be required in order to use Twisted's SSL
   features. (#4974)
 - backwardsCompatImplements and fixClassImplements are removed from
   twisted.python.components, deprecated in 2006. (#5034)
 - twisted.python.reflect.macro was removed, deprecated since Twisted
   8.2. (#5035)
 - twisted.python.text.docstringLStrip, deprecated since Twisted
   10.2.0, has been removed (#5036)
 - Removed the deprecated dispatch and dispatchWithCallback methods
   from twisted.python.threadpool.ThreadPool (deprecated since 8.0)
   (#5037)
 - twisted.scripts.tapconvert is now deprecated. (#5038)
 - twisted.python.reflect's Settable, AccessorType, PropertyAccessor,
   Accessor, OriginalAccessor and Summer are now deprecated.  (#5451)
 - twisted.python.threadpool.ThreadSafeList (deprecated in 10.1) is
   removed. (#5473)
 - twisted.application.app.initialLog, deprecated since Twisted 8.2.0,
   has been removed. (#5480)
 - twisted.spread.refpath was deleted, deprecated since Twisted 9.0.
   (#5482)
 - twisted.python.otp, deprecated since 9.0, is removed. (#5493)
 - Removed `dsu`, `moduleMovedForSplit`, and `dict` from
   twisted.python.util (deprecated since 10.2) (#5516)


Twisted Conch 12.1.0 (2012-06-02)
=================================

Features
--------
 - twisted.conch.tap now supports cred plugins (#4753)


Twisted Names 12.1.0 (2012-06-02)
=================================

Features
--------
 - "twistd dns" secondary server functionality and
   twisted.names.secondary now support retrieving zone information
   from a master running on a non-standard DNS port. (#5468)


Twisted News 12.1.0 (2012-06-02)
================================

Deprecations and Removals
-------------------------
 - The ability to pass a string article to NNTPServer._gotBody and
   NNTPServer._gotArticle in t.news.nntp has been deprecated for years
   and is now removed. (#4548)


Twisted Runner 12.1.0 (2012-06-02)
==================================

Deprecations and Removals
-------------------------
 - ProcessMonitor.active, consistencyDelay, and consistency in
   twisted.runner.procmon were deprecated since 10.1 have been
   removed. (#5517)


Twisted Web 12.1.0 (2012-06-02)
===============================

Features
--------
 - twisted.web.client.Agent and ProxyAgent now support persistent
   connections. (#3420)
 - Added twisted.web.template.renderElement, a function which renders
   an Element to a response. (#5395)
 - twisted.web.client.HTTPConnectionPool now ensures that failed
   queries on persistent connections are retried, when possible.
   (#5479)
 - twisted.web.template.XMLFile now supports FilePath objects. (#5509)
 - twisted.web.template.renderElement takes a doctype keyword
   argument, which will be written as the first line of the response,
   defaulting to the HTML5 doctype. (#5560)

Deprecations and Removals
-------------------------
 - PHP3Script and PHPScript were removed from twisted.web.twcgi,
   deprecated since 10.1. Use twcgi.FilteredScript instead. (#5456)
 - twisted.web.template.XMLFile's support for file objects and
   filenames is now deprecated.  Use the new support for FilePath
   objects. (#5509)
 - twisted.web.server.date_time_string and
   twisted.web.server.string_date_time are now deprecated in favor of
   twisted.web.http.datetimeToString and twisted.web.
   http.stringToDatetime (#5535)

5 files changed, 199 insertions, 104 deletions

diff --git a/net/py-twisted/Makefile b/net/py-twisted/Makefile
index 178a9f07436..9ae8a14faf3 100644
--- a/net/py-twisted/Makefile
+++ b/net/py-twisted/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2010/11/04 19:40:02 adam Exp $
+# $NetBSD: Makefile,v 1.18 2013/02/17 14:53:13 gdt Exp $
 
 PKGNAME=	${PYPKGPREFIX}-twisted-${TWISTED_VERSION}
 COMMENT=	Framework for writing networked applications
@@ -13,11 +13,17 @@ CONFLICTS+=		cftp-[0-9]*
 REPLACE_PYTHON+=	twisted/mail/test/pop3testserver.py
 REPLACE_PYTHON+=	twisted/trial/test/scripttest.py
 REPLACE_PYTHON+=	twisted/topfiles/setup.py
+REPLACE_PYTHON+=	twisted/python/test/pullpipe.py
 
-post-patch:
+# twisted will install files present in the source directory even
+# though they were not in the tarball.  Therefore, we must clean the
+# .orig files from patches.  This is done pre-install rather than
+# post-patch so that mkpatches(1) will still work.
+pre-install:
 	rm ${WRKSRC}/twisted/runner/portmap.c.orig
-	rm ${WRKSRC}/twisted/test/generator_failure_tests.py.orig
 
+# Do not "make package" after running "make test"; this will result in files
+# being installed that should not be.
 do-test:
 	cd ${WRKSRC} && ./build/scripts-${PYVERSSUFFIX}/trial twisted
 
diff --git a/net/py-twisted/Makefile.common b/net/py-twisted/Makefile.common
index 349b3f85856..4a604c9804f 100644
--- a/net/py-twisted/Makefile.common
+++ b/net/py-twisted/Makefile.common
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile.common,v 1.10 2012/10/23 17:19:03 asau Exp $
+# $NetBSD: Makefile.common,v 1.11 2013/02/17 14:53:13 gdt Exp $
 # used by net/py-twisted/Makefile
 # used by net/py-twisted-docs/Makefile
 
-TWISTED_VERSION=	12.0.0
+TWISTED_MAJOR=		12.3
+TWISTED_VERSION=	${TWISTED_MAJOR}.0
 
 DISTNAME=	Twisted-${TWISTED_VERSION}
 CATEGORIES=	net python
-MASTER_SITES=	http://twistedmatrix.com/Releases/Twisted/12.0/
+MASTER_SITES=	http://twistedmatrix.com/Releases/Twisted/${TWISTED_MAJOR}/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/net/py-twisted/PLIST b/net/py-twisted/PLIST
index 2eb89c66365..39002d29539 100644
--- a/net/py-twisted/PLIST
+++ b/net/py-twisted/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2012/04/20 18:47:37 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2013/02/17 14:53:13 gdt Exp $
 bin/cftp
 bin/ckeygen
 bin/conch
@@ -153,6 +153,9 @@ ${PYSITELIB}/twisted/conch/scripts/tkconch.pyo
 ${PYSITELIB}/twisted/conch/ssh/__init__.py
 ${PYSITELIB}/twisted/conch/ssh/__init__.pyc
 ${PYSITELIB}/twisted/conch/ssh/__init__.pyo
+${PYSITELIB}/twisted/conch/ssh/address.py
+${PYSITELIB}/twisted/conch/ssh/address.pyc
+${PYSITELIB}/twisted/conch/ssh/address.pyo
 ${PYSITELIB}/twisted/conch/ssh/agent.py
 ${PYSITELIB}/twisted/conch/ssh/agent.pyc
 ${PYSITELIB}/twisted/conch/ssh/agent.pyo
@@ -207,6 +210,9 @@ ${PYSITELIB}/twisted/conch/test/__init__.pyo
 ${PYSITELIB}/twisted/conch/test/keydata.py
 ${PYSITELIB}/twisted/conch/test/keydata.pyc
 ${PYSITELIB}/twisted/conch/test/keydata.pyo
+${PYSITELIB}/twisted/conch/test/test_address.py
+${PYSITELIB}/twisted/conch/test/test_address.pyc
+${PYSITELIB}/twisted/conch/test/test_address.pyo
 ${PYSITELIB}/twisted/conch/test/test_agent.py
 ${PYSITELIB}/twisted/conch/test/test_agent.pyc
 ${PYSITELIB}/twisted/conch/test/test_agent.pyo
@@ -344,6 +350,12 @@ ${PYSITELIB}/twisted/internet/_baseprocess.pyo
 ${PYSITELIB}/twisted/internet/_dumbwin32proc.py
 ${PYSITELIB}/twisted/internet/_dumbwin32proc.pyc
 ${PYSITELIB}/twisted/internet/_dumbwin32proc.pyo
+${PYSITELIB}/twisted/internet/_endpointspy3.py
+${PYSITELIB}/twisted/internet/_endpointspy3.pyc
+${PYSITELIB}/twisted/internet/_endpointspy3.pyo
+${PYSITELIB}/twisted/internet/_glibbase.py
+${PYSITELIB}/twisted/internet/_glibbase.pyc
+${PYSITELIB}/twisted/internet/_glibbase.pyo
 ${PYSITELIB}/twisted/internet/_newtls.py
 ${PYSITELIB}/twisted/internet/_newtls.pyc
 ${PYSITELIB}/twisted/internet/_newtls.pyo
@@ -359,8 +371,6 @@ ${PYSITELIB}/twisted/internet/_posixserialport.pyo
 ${PYSITELIB}/twisted/internet/_posixstdio.py
 ${PYSITELIB}/twisted/internet/_posixstdio.pyc
 ${PYSITELIB}/twisted/internet/_posixstdio.pyo
-${PYSITELIB}/twisted/internet/_sigchld.c
-${PYSITELIB}/twisted/internet/_sigchld.so
 ${PYSITELIB}/twisted/internet/_signals.py
 ${PYSITELIB}/twisted/internet/_signals.pyc
 ${PYSITELIB}/twisted/internet/_signals.pyo
@@ -373,6 +383,9 @@ ${PYSITELIB}/twisted/internet/_sslverify.pyo
 ${PYSITELIB}/twisted/internet/_threadedselect.py
 ${PYSITELIB}/twisted/internet/_threadedselect.pyc
 ${PYSITELIB}/twisted/internet/_threadedselect.pyo
+${PYSITELIB}/twisted/internet/_utilspy3.py
+${PYSITELIB}/twisted/internet/_utilspy3.pyc
+${PYSITELIB}/twisted/internet/_utilspy3.pyo
 ${PYSITELIB}/twisted/internet/_win32serialport.py
 ${PYSITELIB}/twisted/internet/_win32serialport.pyc
 ${PYSITELIB}/twisted/internet/_win32serialport.pyo
@@ -409,12 +422,18 @@ ${PYSITELIB}/twisted/internet/error.pyo
 ${PYSITELIB}/twisted/internet/fdesc.py
 ${PYSITELIB}/twisted/internet/fdesc.pyc
 ${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
+${PYSITELIB}/twisted/internet/gtk3reactor.py
+${PYSITELIB}/twisted/internet/gtk3reactor.pyc
+${PYSITELIB}/twisted/internet/gtk3reactor.pyo
 ${PYSITELIB}/twisted/internet/gtkreactor.py
 ${PYSITELIB}/twisted/internet/gtkreactor.pyc
 ${PYSITELIB}/twisted/internet/gtkreactor.pyo
@@ -522,9 +541,12 @@ ${PYSITELIB}/twisted/internet/test/fake_CAs/thing2.pem
 ${PYSITELIB}/twisted/internet/test/fakeendpoint.py
 ${PYSITELIB}/twisted/internet/test/fakeendpoint.pyc
 ${PYSITELIB}/twisted/internet/test/fakeendpoint.pyo
-${PYSITELIB}/twisted/internet/test/inlinecb_tests.py
-${PYSITELIB}/twisted/internet/test/inlinecb_tests.pyc
-${PYSITELIB}/twisted/internet/test/inlinecb_tests.pyo
+${PYSITELIB}/twisted/internet/test/modulehelpers.py
+${PYSITELIB}/twisted/internet/test/modulehelpers.pyc
+${PYSITELIB}/twisted/internet/test/modulehelpers.pyo
+${PYSITELIB}/twisted/internet/test/process_gireactornocompat.py
+${PYSITELIB}/twisted/internet/test/process_gireactornocompat.pyc
+${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
@@ -552,12 +574,24 @@ ${PYSITELIB}/twisted/internet/test/test_default.pyo
 ${PYSITELIB}/twisted/internet/test/test_endpoints.py
 ${PYSITELIB}/twisted/internet/test/test_endpoints.pyc
 ${PYSITELIB}/twisted/internet/test/test_endpoints.pyo
+${PYSITELIB}/twisted/internet/test/test_endpointspy3.py
+${PYSITELIB}/twisted/internet/test/test_endpointspy3.pyc
+${PYSITELIB}/twisted/internet/test/test_endpointspy3.pyo
+${PYSITELIB}/twisted/internet/test/test_epollreactor.py
+${PYSITELIB}/twisted/internet/test/test_epollreactor.pyc
+${PYSITELIB}/twisted/internet/test/test_epollreactor.pyo
 ${PYSITELIB}/twisted/internet/test/test_fdset.py
 ${PYSITELIB}/twisted/internet/test/test_fdset.pyc
 ${PYSITELIB}/twisted/internet/test/test_fdset.pyo
 ${PYSITELIB}/twisted/internet/test/test_filedescriptor.py
 ${PYSITELIB}/twisted/internet/test/test_filedescriptor.pyc
 ${PYSITELIB}/twisted/internet/test/test_filedescriptor.pyo
+${PYSITELIB}/twisted/internet/test/test_gireactor.py
+${PYSITELIB}/twisted/internet/test/test_gireactor.pyc
+${PYSITELIB}/twisted/internet/test/test_gireactor.pyo
+${PYSITELIB}/twisted/internet/test/test_glibbase.py
+${PYSITELIB}/twisted/internet/test/test_glibbase.pyc
+${PYSITELIB}/twisted/internet/test/test_glibbase.pyo
 ${PYSITELIB}/twisted/internet/test/test_gtkreactor.py
 ${PYSITELIB}/twisted/internet/test/test_gtkreactor.pyc
 ${PYSITELIB}/twisted/internet/test/test_gtkreactor.pyo
@@ -567,9 +601,6 @@ ${PYSITELIB}/twisted/internet/test/test_inlinecb.pyo
 ${PYSITELIB}/twisted/internet/test/test_inotify.py
 ${PYSITELIB}/twisted/internet/test/test_inotify.pyc
 ${PYSITELIB}/twisted/internet/test/test_inotify.pyo
-${PYSITELIB}/twisted/internet/test/test_interfaces.py
-${PYSITELIB}/twisted/internet/test/test_interfaces.pyc
-${PYSITELIB}/twisted/internet/test/test_interfaces.pyo
 ${PYSITELIB}/twisted/internet/test/test_iocp.py
 ${PYSITELIB}/twisted/internet/test/test_iocp.pyc
 ${PYSITELIB}/twisted/internet/test/test_iocp.pyo
@@ -603,6 +634,12 @@ ${PYSITELIB}/twisted/internet/test/test_serialport.pyo
 ${PYSITELIB}/twisted/internet/test/test_sigchld.py
 ${PYSITELIB}/twisted/internet/test/test_sigchld.pyc
 ${PYSITELIB}/twisted/internet/test/test_sigchld.pyo
+${PYSITELIB}/twisted/internet/test/test_socket.py
+${PYSITELIB}/twisted/internet/test/test_socket.pyc
+${PYSITELIB}/twisted/internet/test/test_socket.pyo
+${PYSITELIB}/twisted/internet/test/test_stdio.py
+${PYSITELIB}/twisted/internet/test/test_stdio.pyc
+${PYSITELIB}/twisted/internet/test/test_stdio.pyo
 ${PYSITELIB}/twisted/internet/test/test_tcp.py
 ${PYSITELIB}/twisted/internet/test/test_tcp.pyc
 ${PYSITELIB}/twisted/internet/test/test_tcp.pyo
@@ -624,6 +661,9 @@ ${PYSITELIB}/twisted/internet/test/test_udp_internals.pyo
 ${PYSITELIB}/twisted/internet/test/test_unix.py
 ${PYSITELIB}/twisted/internet/test/test_unix.pyc
 ${PYSITELIB}/twisted/internet/test/test_unix.pyo
+${PYSITELIB}/twisted/internet/test/test_utilspy3.py
+${PYSITELIB}/twisted/internet/test/test_utilspy3.pyc
+${PYSITELIB}/twisted/internet/test/test_utilspy3.pyo
 ${PYSITELIB}/twisted/internet/test/test_win32events.py
 ${PYSITELIB}/twisted/internet/test/test_win32events.pyc
 ${PYSITELIB}/twisted/internet/test/test_win32events.pyo
@@ -806,6 +846,7 @@ ${PYSITELIB}/twisted/mail/test/pop3testserver.py
 ${PYSITELIB}/twisted/mail/test/pop3testserver.pyc
 ${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
@@ -947,6 +988,9 @@ ${PYSITELIB}/twisted/names/test/test_rootresolve.pyo
 ${PYSITELIB}/twisted/names/test/test_srvconnect.py
 ${PYSITELIB}/twisted/names/test/test_srvconnect.pyc
 ${PYSITELIB}/twisted/names/test/test_srvconnect.pyo
+${PYSITELIB}/twisted/names/test/test_tap.py
+${PYSITELIB}/twisted/names/test/test_tap.pyc
+${PYSITELIB}/twisted/names/test/test_tap.pyo
 ${PYSITELIB}/twisted/names/topfiles/NEWS
 ${PYSITELIB}/twisted/names/topfiles/README
 ${PYSITELIB}/twisted/news/__init__.py
@@ -1028,15 +1072,6 @@ ${PYSITELIB}/twisted/persisted/crefutil.pyo
 ${PYSITELIB}/twisted/persisted/dirdbm.py
 ${PYSITELIB}/twisted/persisted/dirdbm.pyc
 ${PYSITELIB}/twisted/persisted/dirdbm.pyo
-${PYSITELIB}/twisted/persisted/journal/__init__.py
-${PYSITELIB}/twisted/persisted/journal/__init__.pyc
-${PYSITELIB}/twisted/persisted/journal/__init__.pyo
-${PYSITELIB}/twisted/persisted/journal/base.py
-${PYSITELIB}/twisted/persisted/journal/base.pyc
-${PYSITELIB}/twisted/persisted/journal/base.pyo
-${PYSITELIB}/twisted/persisted/journal/picklelog.py
-${PYSITELIB}/twisted/persisted/journal/picklelog.pyc
-${PYSITELIB}/twisted/persisted/journal/picklelog.pyo
 ${PYSITELIB}/twisted/persisted/sob.py
 ${PYSITELIB}/twisted/persisted/sob.pyc
 ${PYSITELIB}/twisted/persisted/sob.pyo
@@ -1064,13 +1099,18 @@ ${PYSITELIB}/twisted/plugins/cred_file.pyo
 ${PYSITELIB}/twisted/plugins/cred_memory.py
 ${PYSITELIB}/twisted/plugins/cred_memory.pyc
 ${PYSITELIB}/twisted/plugins/cred_memory.pyo
+${PYSITELIB}/twisted/plugins/cred_sshkeys.py
+${PYSITELIB}/twisted/plugins/cred_sshkeys.pyc
+${PYSITELIB}/twisted/plugins/cred_sshkeys.pyo
 ${PYSITELIB}/twisted/plugins/cred_unix.py
 ${PYSITELIB}/twisted/plugins/cred_unix.pyc
 ${PYSITELIB}/twisted/plugins/cred_unix.pyo
-@unexec ${RM} -f %D/${PYSITELIB}/twisted/plugins/dropin.cache
 ${PYSITELIB}/twisted/plugins/twisted_conch.py
 ${PYSITELIB}/twisted/plugins/twisted_conch.pyc
 ${PYSITELIB}/twisted/plugins/twisted_conch.pyo
+${PYSITELIB}/twisted/plugins/twisted_core.py
+${PYSITELIB}/twisted/plugins/twisted_core.pyc
+${PYSITELIB}/twisted/plugins/twisted_core.pyo
 ${PYSITELIB}/twisted/plugins/twisted_ftp.py
 ${PYSITELIB}/twisted/plugins/twisted_ftp.pyc
 ${PYSITELIB}/twisted/plugins/twisted_ftp.pyo
@@ -1194,6 +1234,9 @@ ${PYSITELIB}/twisted/protocols/telnet.pyo
 ${PYSITELIB}/twisted/protocols/test/__init__.py
 ${PYSITELIB}/twisted/protocols/test/__init__.pyc
 ${PYSITELIB}/twisted/protocols/test/__init__.pyo
+${PYSITELIB}/twisted/protocols/test/test_basic.py
+${PYSITELIB}/twisted/protocols/test/test_basic.pyc
+${PYSITELIB}/twisted/protocols/test/test_basic.pyo
 ${PYSITELIB}/twisted/protocols/test/test_tls.py
 ${PYSITELIB}/twisted/protocols/test/test_tls.pyc
 ${PYSITELIB}/twisted/protocols/test/test_tls.pyo
@@ -1209,16 +1252,21 @@ ${PYSITELIB}/twisted/python/__init__.pyo
 ${PYSITELIB}/twisted/python/_epoll.c
 ${PYSITELIB}/twisted/python/_epoll.pyx
 ${PYSITELIB}/twisted/python/_initgroups.c
-${PYSITELIB}/twisted/python/_initgroups.so
 ${PYSITELIB}/twisted/python/_inotify.py
 ${PYSITELIB}/twisted/python/_inotify.pyc
 ${PYSITELIB}/twisted/python/_inotify.pyo
+${PYSITELIB}/twisted/python/_reflectpy3.py
+${PYSITELIB}/twisted/python/_reflectpy3.pyc
+${PYSITELIB}/twisted/python/_reflectpy3.pyo
 ${PYSITELIB}/twisted/python/_release.py
 ${PYSITELIB}/twisted/python/_release.pyc
 ${PYSITELIB}/twisted/python/_release.pyo
 ${PYSITELIB}/twisted/python/_shellcomp.py
 ${PYSITELIB}/twisted/python/_shellcomp.pyc
 ${PYSITELIB}/twisted/python/_shellcomp.pyo
+${PYSITELIB}/twisted/python/_utilpy3.py
+${PYSITELIB}/twisted/python/_utilpy3.pyc
+${PYSITELIB}/twisted/python/_utilpy3.pyo
 ${PYSITELIB}/twisted/python/compat.py
 ${PYSITELIB}/twisted/python/compat.pyc
 ${PYSITELIB}/twisted/python/compat.pyo
@@ -1276,9 +1324,6 @@ ${PYSITELIB}/twisted/python/modules.pyo
 ${PYSITELIB}/twisted/python/monkey.py
 ${PYSITELIB}/twisted/python/monkey.pyc
 ${PYSITELIB}/twisted/python/monkey.pyo
-${PYSITELIB}/twisted/python/otp.py
-${PYSITELIB}/twisted/python/otp.pyc
-${PYSITELIB}/twisted/python/otp.pyo
 ${PYSITELIB}/twisted/python/procutils.py
 ${PYSITELIB}/twisted/python/procutils.pyc
 ${PYSITELIB}/twisted/python/procutils.pyo
@@ -1300,12 +1345,17 @@ ${PYSITELIB}/twisted/python/roots.pyo
 ${PYSITELIB}/twisted/python/runtime.py
 ${PYSITELIB}/twisted/python/runtime.pyc
 ${PYSITELIB}/twisted/python/runtime.pyo
+${PYSITELIB}/twisted/python/sendmsg.c
+${PYSITELIB}/twisted/python/sendmsg.so
 ${PYSITELIB}/twisted/python/shortcut.py
 ${PYSITELIB}/twisted/python/shortcut.pyc
 ${PYSITELIB}/twisted/python/shortcut.pyo
 ${PYSITELIB}/twisted/python/syslog.py
 ${PYSITELIB}/twisted/python/syslog.pyc
 ${PYSITELIB}/twisted/python/syslog.pyo
+${PYSITELIB}/twisted/python/systemd.py
+${PYSITELIB}/twisted/python/systemd.pyc
+${PYSITELIB}/twisted/python/systemd.pyo
 ${PYSITELIB}/twisted/python/test/__init__.py
 ${PYSITELIB}/twisted/python/test/__init__.pyc
 ${PYSITELIB}/twisted/python/test/__init__.pyo
@@ -1315,6 +1365,9 @@ ${PYSITELIB}/twisted/python/test/deprecatedattributes.pyo
 ${PYSITELIB}/twisted/python/test/modules_helpers.py
 ${PYSITELIB}/twisted/python/test/modules_helpers.pyc
 ${PYSITELIB}/twisted/python/test/modules_helpers.pyo
+${PYSITELIB}/twisted/python/test/pullpipe.py
+${PYSITELIB}/twisted/python/test/pullpipe.pyc
+${PYSITELIB}/twisted/python/test/pullpipe.pyo
 ${PYSITELIB}/twisted/python/test/test_components.py
 ${PYSITELIB}/twisted/python/test/test_components.pyc
 ${PYSITELIB}/twisted/python/test/test_components.pyo
@@ -1339,27 +1392,45 @@ ${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_reflectpy3.py
+${PYSITELIB}/twisted/python/test/test_reflectpy3.pyc
+${PYSITELIB}/twisted/python/test/test_reflectpy3.pyo
 ${PYSITELIB}/twisted/python/test/test_release.py
 ${PYSITELIB}/twisted/python/test/test_release.pyc
 ${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
+${PYSITELIB}/twisted/python/test/test_sendmsg.py
+${PYSITELIB}/twisted/python/test/test_sendmsg.pyc
+${PYSITELIB}/twisted/python/test/test_sendmsg.pyo
 ${PYSITELIB}/twisted/python/test/test_shellcomp.py
 ${PYSITELIB}/twisted/python/test/test_shellcomp.pyc
 ${PYSITELIB}/twisted/python/test/test_shellcomp.pyo
 ${PYSITELIB}/twisted/python/test/test_syslog.py
 ${PYSITELIB}/twisted/python/test/test_syslog.pyc
 ${PYSITELIB}/twisted/python/test/test_syslog.pyo
+${PYSITELIB}/twisted/python/test/test_systemd.py
+${PYSITELIB}/twisted/python/test/test_systemd.pyc
+${PYSITELIB}/twisted/python/test/test_systemd.pyo
+${PYSITELIB}/twisted/python/test/test_urlpath.py
+${PYSITELIB}/twisted/python/test/test_urlpath.pyc
+${PYSITELIB}/twisted/python/test/test_urlpath.pyo
 ${PYSITELIB}/twisted/python/test/test_util.py
 ${PYSITELIB}/twisted/python/test/test_util.pyc
 ${PYSITELIB}/twisted/python/test/test_util.pyo
+${PYSITELIB}/twisted/python/test/test_utilpy3.py
+${PYSITELIB}/twisted/python/test/test_utilpy3.pyc
+${PYSITELIB}/twisted/python/test/test_utilpy3.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
+${PYSITELIB}/twisted/python/test/test_zippath.py
+${PYSITELIB}/twisted/python/test/test_zippath.pyc
+${PYSITELIB}/twisted/python/test/test_zippath.pyo
 ${PYSITELIB}/twisted/python/test/test_zipstream.py
 ${PYSITELIB}/twisted/python/test/test_zipstream.pyc
 ${PYSITELIB}/twisted/python/test/test_zipstream.pyo
@@ -1513,9 +1584,6 @@ ${PYSITELIB}/twisted/spread/pb.pyo
 ${PYSITELIB}/twisted/spread/publish.py
 ${PYSITELIB}/twisted/spread/publish.pyc
 ${PYSITELIB}/twisted/spread/publish.pyo
-${PYSITELIB}/twisted/spread/refpath.py
-${PYSITELIB}/twisted/spread/refpath.pyc
-${PYSITELIB}/twisted/spread/refpath.pyo
 ${PYSITELIB}/twisted/spread/ui/__init__.py
 ${PYSITELIB}/twisted/spread/ui/__init__.pyc
 ${PYSITELIB}/twisted/spread/ui/__init__.pyo
@@ -1553,12 +1621,12 @@ ${PYSITELIB}/twisted/tap/telnet.pyo
 ${PYSITELIB}/twisted/test/__init__.py
 ${PYSITELIB}/twisted/test/__init__.pyc
 ${PYSITELIB}/twisted/test/__init__.pyo
+${PYSITELIB}/twisted/test/_preamble.py
+${PYSITELIB}/twisted/test/_preamble.pyc
+${PYSITELIB}/twisted/test/_preamble.pyo
 ${PYSITELIB}/twisted/test/crash_test_dummy.py
 ${PYSITELIB}/twisted/test/crash_test_dummy.pyc
 ${PYSITELIB}/twisted/test/crash_test_dummy.pyo
-${PYSITELIB}/twisted/test/generator_failure_tests.py
-${PYSITELIB}/twisted/test/generator_failure_tests.pyc
-${PYSITELIB}/twisted/test/generator_failure_tests.pyo
 ${PYSITELIB}/twisted/test/iosim.py
 ${PYSITELIB}/twisted/test/iosim.pyc
 ${PYSITELIB}/twisted/test/iosim.pyo
@@ -1746,9 +1814,6 @@ ${PYSITELIB}/twisted/test/test_iutils.pyo
 ${PYSITELIB}/twisted/test/test_jelly.py
 ${PYSITELIB}/twisted/test/test_jelly.pyc
 ${PYSITELIB}/twisted/test/test_jelly.pyo
-${PYSITELIB}/twisted/test/test_journal.py
-${PYSITELIB}/twisted/test/test_journal.pyc
-${PYSITELIB}/twisted/test/test_journal.pyo
 ${PYSITELIB}/twisted/test/test_lockfile.py
 ${PYSITELIB}/twisted/test/test_lockfile.pyc
 ${PYSITELIB}/twisted/test/test_lockfile.pyo
@@ -1821,6 +1886,9 @@ ${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_setup.py
+${PYSITELIB}/twisted/test/test_setup.pyc
+${PYSITELIB}/twisted/test/test_setup.pyo
 ${PYSITELIB}/twisted/test/test_shortcut.py
 ${PYSITELIB}/twisted/test/test_shortcut.pyc
 ${PYSITELIB}/twisted/test/test_shortcut.pyo
@@ -1878,15 +1946,15 @@ ${PYSITELIB}/twisted/test/test_threadpool.pyo
 ${PYSITELIB}/twisted/test/test_threads.py
 ${PYSITELIB}/twisted/test/test_threads.pyc
 ${PYSITELIB}/twisted/test/test_threads.pyo
-${PYSITELIB}/twisted/test/test_timehelpers.py
-${PYSITELIB}/twisted/test/test_timehelpers.pyc
-${PYSITELIB}/twisted/test/test_timehelpers.pyo
 ${PYSITELIB}/twisted/test/test_tpfile.py
 ${PYSITELIB}/twisted/test/test_tpfile.pyc
 ${PYSITELIB}/twisted/test/test_tpfile.pyo
 ${PYSITELIB}/twisted/test/test_twistd.py
 ${PYSITELIB}/twisted/test/test_twistd.pyc
 ${PYSITELIB}/twisted/test/test_twistd.pyo
+${PYSITELIB}/twisted/test/test_twisted.py
+${PYSITELIB}/twisted/test/test_twisted.pyc
+${PYSITELIB}/twisted/test/test_twisted.pyo
 ${PYSITELIB}/twisted/test/test_udp.py
 ${PYSITELIB}/twisted/test/test_udp.pyc
 ${PYSITELIB}/twisted/test/test_udp.pyo
@@ -1899,9 +1967,6 @@ ${PYSITELIB}/twisted/test/test_usage.pyo
 ${PYSITELIB}/twisted/test/testutils.py
 ${PYSITELIB}/twisted/test/testutils.pyc
 ${PYSITELIB}/twisted/test/testutils.pyo
-${PYSITELIB}/twisted/test/time_helpers.py
-${PYSITELIB}/twisted/test/time_helpers.pyc
-${PYSITELIB}/twisted/test/time_helpers.pyo
 ${PYSITELIB}/twisted/topfiles/CREDITS
 ${PYSITELIB}/twisted/topfiles/ChangeLog.Old
 ${PYSITELIB}/twisted/topfiles/NEWS
@@ -1909,6 +1974,66 @@ ${PYSITELIB}/twisted/topfiles/README
 ${PYSITELIB}/twisted/trial/__init__.py
 ${PYSITELIB}/twisted/trial/__init__.pyc
 ${PYSITELIB}/twisted/trial/__init__.pyo
+${PYSITELIB}/twisted/trial/_asyncrunner.py
+${PYSITELIB}/twisted/trial/_asyncrunner.pyc
+${PYSITELIB}/twisted/trial/_asyncrunner.pyo
+${PYSITELIB}/twisted/trial/_asynctest.py
+${PYSITELIB}/twisted/trial/_asynctest.pyc
+${PYSITELIB}/twisted/trial/_asynctest.pyo
+${PYSITELIB}/twisted/trial/_dist/__init__.py
+${PYSITELIB}/twisted/trial/_dist/__init__.pyc
+${PYSITELIB}/twisted/trial/_dist/__init__.pyo
+${PYSITELIB}/twisted/trial/_dist/_preamble.py
+${PYSITELIB}/twisted/trial/_dist/_preamble.pyc
+${PYSITELIB}/twisted/trial/_dist/_preamble.pyo
+${PYSITELIB}/twisted/trial/_dist/distreporter.py
+${PYSITELIB}/twisted/trial/_dist/distreporter.pyc
+${PYSITELIB}/twisted/trial/_dist/distreporter.pyo
+${PYSITELIB}/twisted/trial/_dist/disttrial.py
+${PYSITELIB}/twisted/trial/_dist/disttrial.pyc
+${PYSITELIB}/twisted/trial/_dist/disttrial.pyo
+${PYSITELIB}/twisted/trial/_dist/managercommands.py
+${PYSITELIB}/twisted/trial/_dist/managercommands.pyc
+${PYSITELIB}/twisted/trial/_dist/managercommands.pyo
+${PYSITELIB}/twisted/trial/_dist/options.py
+${PYSITELIB}/twisted/trial/_dist/options.pyc
+${PYSITELIB}/twisted/trial/_dist/options.pyo
+${PYSITELIB}/twisted/trial/_dist/test/__init__.py
+${PYSITELIB}/twisted/trial/_dist/test/__init__.pyc
+${PYSITELIB}/twisted/trial/_dist/test/__init__.pyo
+${PYSITELIB}/twisted/trial/_dist/test/test_distreporter.py
+${PYSITELIB}/twisted/trial/_dist/test/test_distreporter.pyc
+${PYSITELIB}/twisted/trial/_dist/test/test_distreporter.pyo
+${PYSITELIB}/twisted/trial/_dist/test/test_disttrial.py
+${PYSITELIB}/twisted/trial/_dist/test/test_disttrial.pyc
+${PYSITELIB}/twisted/trial/_dist/test/test_disttrial.pyo
+${PYSITELIB}/twisted/trial/_dist/test/test_options.py
+${PYSITELIB}/twisted/trial/_dist/test/test_options.pyc
+${PYSITELIB}/twisted/trial/_dist/test/test_options.pyo
+${PYSITELIB}/twisted/trial/_dist/test/test_worker.py
+${PYSITELIB}/twisted/trial/_dist/test/test_worker.pyc
+${PYSITELIB}/twisted/trial/_dist/test/test_worker.pyo
+${PYSITELIB}/twisted/trial/_dist/test/test_workerreporter.py
+${PYSITELIB}/twisted/trial/_dist/test/test_workerreporter.pyc
+${PYSITELIB}/twisted/trial/_dist/test/test_workerreporter.pyo
+${PYSITELIB}/twisted/trial/_dist/test/test_workertrial.py
+${PYSITELIB}/twisted/trial/_dist/test/test_workertrial.pyc
+${PYSITELIB}/twisted/trial/_dist/test/test_workertrial.pyo
+${PYSITELIB}/twisted/trial/_dist/worker.py
+${PYSITELIB}/twisted/trial/_dist/worker.pyc
+${PYSITELIB}/twisted/trial/_dist/worker.pyo
+${PYSITELIB}/twisted/trial/_dist/workercommands.py
+${PYSITELIB}/twisted/trial/_dist/workercommands.pyc
+${PYSITELIB}/twisted/trial/_dist/workercommands.pyo
+${PYSITELIB}/twisted/trial/_dist/workerreporter.py
+${PYSITELIB}/twisted/trial/_dist/workerreporter.pyc
+${PYSITELIB}/twisted/trial/_dist/workerreporter.pyo
+${PYSITELIB}/twisted/trial/_dist/workertrial.py
+${PYSITELIB}/twisted/trial/_dist/workertrial.pyc
+${PYSITELIB}/twisted/trial/_dist/workertrial.pyo
+${PYSITELIB}/twisted/trial/_synctest.py
+${PYSITELIB}/twisted/trial/_synctest.pyc
+${PYSITELIB}/twisted/trial/_synctest.pyo
 ${PYSITELIB}/twisted/trial/itrial.py
 ${PYSITELIB}/twisted/trial/itrial.pyc
 ${PYSITELIB}/twisted/trial/itrial.pyo
@@ -1958,12 +2083,18 @@ ${PYSITELIB}/twisted/trial/test/sample.pyo
 ${PYSITELIB}/twisted/trial/test/scripttest.py
 ${PYSITELIB}/twisted/trial/test/scripttest.pyc
 ${PYSITELIB}/twisted/trial/test/scripttest.pyo
+${PYSITELIB}/twisted/trial/test/skipping.py
+${PYSITELIB}/twisted/trial/test/skipping.pyc
+${PYSITELIB}/twisted/trial/test/skipping.pyo
 ${PYSITELIB}/twisted/trial/test/suppression.py
 ${PYSITELIB}/twisted/trial/test/suppression.pyc
 ${PYSITELIB}/twisted/trial/test/suppression.pyo
 ${PYSITELIB}/twisted/trial/test/test_assertions.py
 ${PYSITELIB}/twisted/trial/test/test_assertions.pyc
 ${PYSITELIB}/twisted/trial/test/test_assertions.pyo
+${PYSITELIB}/twisted/trial/test/test_asyncassertions.py
+${PYSITELIB}/twisted/trial/test/test_asyncassertions.pyc
+${PYSITELIB}/twisted/trial/test/test_asyncassertions.pyo
 ${PYSITELIB}/twisted/trial/test/test_deferred.py
 ${PYSITELIB}/twisted/trial/test/test_deferred.pyc
 ${PYSITELIB}/twisted/trial/test/test_deferred.pyo
@@ -1997,6 +2128,9 @@ ${PYSITELIB}/twisted/trial/test/test_runner.pyo
 ${PYSITELIB}/twisted/trial/test/test_script.py
 ${PYSITELIB}/twisted/trial/test/test_script.pyc
 ${PYSITELIB}/twisted/trial/test/test_script.pyo
+${PYSITELIB}/twisted/trial/test/test_suppression.py
+${PYSITELIB}/twisted/trial/test/test_suppression.pyc
+${PYSITELIB}/twisted/trial/test/test_suppression.pyo
 ${PYSITELIB}/twisted/trial/test/test_test_visitor.py
 ${PYSITELIB}/twisted/trial/test/test_test_visitor.pyc
 ${PYSITELIB}/twisted/trial/test/test_test_visitor.pyo
@@ -2045,6 +2179,9 @@ ${PYSITELIB}/twisted/web/_flatten.pyo
 ${PYSITELIB}/twisted/web/_newclient.py
 ${PYSITELIB}/twisted/web/_newclient.pyc
 ${PYSITELIB}/twisted/web/_newclient.pyo
+${PYSITELIB}/twisted/web/_responses.py
+${PYSITELIB}/twisted/web/_responses.pyc
+${PYSITELIB}/twisted/web/_responses.pyo
 ${PYSITELIB}/twisted/web/_stan.py
 ${PYSITELIB}/twisted/web/_stan.pyc
 ${PYSITELIB}/twisted/web/_stan.pyo
@@ -2066,9 +2203,7 @@ ${PYSITELIB}/twisted/web/domhelpers.pyo
 ${PYSITELIB}/twisted/web/error.py
 ${PYSITELIB}/twisted/web/error.pyc
 ${PYSITELIB}/twisted/web/error.pyo
-${PYSITELIB}/twisted/web/google.py
-${PYSITELIB}/twisted/web/google.pyc
-${PYSITELIB}/twisted/web/google.pyo
+${PYSITELIB}/twisted/web/failure.xhtml
 ${PYSITELIB}/twisted/web/guard.py
 ${PYSITELIB}/twisted/web/guard.pyc
 ${PYSITELIB}/twisted/web/guard.pyo
@@ -2123,6 +2258,12 @@ ${PYSITELIB}/twisted/web/test/__init__.pyo
 ${PYSITELIB}/twisted/web/test/_util.py
 ${PYSITELIB}/twisted/web/test/_util.pyc
 ${PYSITELIB}/twisted/web/test/_util.pyo
+${PYSITELIB}/twisted/web/test/requesthelper.py
+${PYSITELIB}/twisted/web/test/requesthelper.pyc
+${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
diff --git a/net/py-twisted/distinfo b/net/py-twisted/distinfo
index fd7d3ef0ed4..f61268321ee 100644
--- a/net/py-twisted/distinfo
+++ b/net/py-twisted/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.10 2012/04/20 18:47:37 adam Exp $
+$NetBSD: distinfo,v 1.11 2013/02/17 14:53:13 gdt Exp $
 
-SHA1 (Twisted-12.0.0.tar.bz2) = 64b7f7fdeefbd4dd8e6bdffb12d9095106ee3d5d
-RMD160 (Twisted-12.0.0.tar.bz2) = 95228c1c8919a61f84ad1d5087c8b96719f11f25
-Size (Twisted-12.0.0.tar.bz2) = 2766488 bytes
+SHA1 (Twisted-12.3.0.tar.bz2) = 921bef9a560edd14ea2b559ac0d674f4dac4fd65
+RMD160 (Twisted-12.3.0.tar.bz2) = 1c0269be44f63f26ad889aa1ff7c42a6141b07ba
+Size (Twisted-12.3.0.tar.bz2) = 2615733 bytes
 SHA1 (patch-ab) = 26495e5abd57025e915b923cc7089704bbd85629
-SHA1 (patch-ac) = 3881dec501db0913a600bde78e6d96a106c33156
diff --git a/net/py-twisted/patches/patch-ac b/net/py-twisted/patches/patch-ac
deleted file mode 100644
index 25a886e85b4..00000000000
--- a/net/py-twisted/patches/patch-ac
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/09/16 01:59:07 epg Exp $
-
-Even though this file isn't run for 2.4, it's still compiled and installed,
-where it fails due to new generator syntax.
-
---- twisted/test/generator_failure_tests.py.orig	2007-11-23 10:27:03.000000000 -0800
-+++ twisted/test/generator_failure_tests.py
-@@ -63,7 +63,7 @@ class TwoPointFiveFailureTests(TestCase)
-         stuff = []
-         def generator():
-             try:
--                yield
-+                yield 1
-             except:
-                 stuff.append(sys.exc_info())
-             else:
-@@ -91,7 +91,7 @@ class TwoPointFiveFailureTests(TestCase)
-         foundFailures = []
-         def generator():
-             try:
--                yield
-+                yield 1
-             except:
-                 foundFailures.append(Failure._findFailure())
-             else:
-@@ -118,7 +118,7 @@ class TwoPointFiveFailureTests(TestCase)
- 
-         def generator():
-             try:
--                yield
-+                yield 1
-             except:
-                 newFailures.append(Failure())
-             else:
-@@ -139,7 +139,7 @@ class TwoPointFiveFailureTests(TestCase)
-         def generator():
-             try:
-                 try:
--                    yield
-+                    yield 1
-                 except:
-                     [][1]
-             except:
-@@ -157,7 +157,7 @@ class TwoPointFiveFailureTests(TestCase)
-         """
-         def generator():
-             try:
--                yield
-+                yield 1
-             except:
-                 [][1]
-         g = generator()