Changes 13.1.0:

- trial now has an --exitfirst flag which stops the test run after
  the first error or failure.
- twisted.internet.ssl.CertificateOptions now supports chain
  certificates.
- twisted.internet.endpoints now provides ProcessEndpoint, a child
  process endpoint.
- Factory now has a forProtocol classmethod that constructs an
  instance and sets its protocol attribute.
- twisted.internet.endpoints.connectProtocol allows connecting to a
  client endpoint using only a protocol instance, rather than
  requiring a factory.
- twisted.trial.unittest.SynchronousTestCase.assertNoResult no longer
  swallows the result, if the assertion succeeds.
- twisted.python.constants.FlagConstant implements __iter__ so that
  it can be iterated upon to find the flags that went into a flag
  set, and implements __nonzero__ to test as false when empty.
- assertIs and assertIsNot have now been added to
  twisted.trial.unittest.TestCase.
- twisted.trial.unittest.TestCase.failureResultOf now takes an
  optional expected failure type argument.
- The POSIX implementation of
  twisted.internet.interfaces.IReactorProcess now does not change the
  parent process UID or GID in order to run child processes with a
  different UID or GID.

5 files changed, 29 insertions, 54 deletions

diff --git a/net/py-twisted-docs/Makefile b/net/py-twisted-docs/Makefile
index dc218d7db90..35cd3c89635 100644
--- a/net/py-twisted-docs/Makefile
+++ b/net/py-twisted-docs/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2012/04/23 01:15:42 obache Exp $
+# $NetBSD: Makefile,v 1.16 2013/08/13 17:47:41 adam Exp $
 
-PKGNAME=	py-twisted-docs-${TWISTED_VERSION}
+PKGNAME=	py-${DISTNAME:S/Twisted/twisted-docs/}
 COMMENT=	Framework for writing networked applications (documentation)
 .include "../../net/py-twisted/Makefile.common"
 
+USE_TOOLS+=	pax
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-USE_TOOLS+=	pax
 
 HTMLDIR=	share/doc/py-twisted-docs
 DOC_SRCDIR=	${WRKSRC}/doc
diff --git a/net/py-twisted/Makefile b/net/py-twisted/Makefile
index 6367b9bfd61..7d7fbd74cc1 100644
--- a/net/py-twisted/Makefile
+++ b/net/py-twisted/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2013/02/27 15:59:59 gdt Exp $
+# $NetBSD: Makefile,v 1.22 2013/08/13 17:47:41 adam Exp $
 
-PKGNAME=	${PYPKGPREFIX}-twisted-${TWISTED_VERSION}
-PKGREVISION=	1
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 COMMENT=	Framework for writing networked applications
 .include "../../net/py-twisted/Makefile.common"
 
diff --git a/net/py-twisted/Makefile.common b/net/py-twisted/Makefile.common
index 4a604c9804f..3669e3b3910 100644
--- a/net/py-twisted/Makefile.common
+++ b/net/py-twisted/Makefile.common
@@ -1,16 +1,13 @@
-# $NetBSD: Makefile.common,v 1.11 2013/02/17 14:53:13 gdt Exp $
+# $NetBSD: Makefile.common,v 1.12 2013/08/13 17:47:41 adam Exp $
 # used by net/py-twisted/Makefile
 # used by net/py-twisted-docs/Makefile
 
-TWISTED_MAJOR=		12.3
-TWISTED_VERSION=	${TWISTED_MAJOR}.0
-
-DISTNAME=	Twisted-${TWISTED_VERSION}
+DISTNAME=	Twisted-13.1.0
 CATEGORIES=	net python
-MASTER_SITES=	http://twistedmatrix.com/Releases/Twisted/${TWISTED_MAJOR}/
+MASTER_SITES=	http://twistedmatrix.com/Releases/Twisted/${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.twistedmatrix.com/
 LICENSE=	mit
 
diff --git a/net/py-twisted/PLIST b/net/py-twisted/PLIST
index ab02777b9cd..ea911fceef0 100644
--- a/net/py-twisted/PLIST
+++ b/net/py-twisted/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2013/02/27 15:59:07 gdt Exp $
+@comment $NetBSD: PLIST,v 1.12 2013/08/13 17:47:41 adam Exp $
 bin/cftp
 bin/ckeygen
 bin/conch
@@ -81,6 +81,9 @@ ${PYSITELIB}/twisted/conch/client/knownhosts.pyo
 ${PYSITELIB}/twisted/conch/client/options.py
 ${PYSITELIB}/twisted/conch/client/options.pyc
 ${PYSITELIB}/twisted/conch/client/options.pyo
+${PYSITELIB}/twisted/conch/endpoints.py
+${PYSITELIB}/twisted/conch/endpoints.pyc
+${PYSITELIB}/twisted/conch/endpoints.pyo
 ${PYSITELIB}/twisted/conch/error.py
 ${PYSITELIB}/twisted/conch/error.pyc
 ${PYSITELIB}/twisted/conch/error.pyo
@@ -237,6 +240,9 @@ ${PYSITELIB}/twisted/conch/test/test_connection.pyo
 ${PYSITELIB}/twisted/conch/test/test_default.py
 ${PYSITELIB}/twisted/conch/test/test_default.pyc
 ${PYSITELIB}/twisted/conch/test/test_default.pyo
+${PYSITELIB}/twisted/conch/test/test_endpoints.py
+${PYSITELIB}/twisted/conch/test/test_endpoints.pyc
+${PYSITELIB}/twisted/conch/test/test_endpoints.pyo
 ${PYSITELIB}/twisted/conch/test/test_filetransfer.py
 ${PYSITELIB}/twisted/conch/test/test_filetransfer.pyc
 ${PYSITELIB}/twisted/conch/test/test_filetransfer.pyo
@@ -350,9 +356,6 @@ ${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
@@ -383,9 +386,6 @@ ${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
@@ -574,9 +574,6 @@ ${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
@@ -661,9 +658,6 @@ ${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
@@ -976,6 +970,9 @@ ${PYSITELIB}/twisted/names/test/test_common.pyo
 ${PYSITELIB}/twisted/names/test/test_dns.py
 ${PYSITELIB}/twisted/names/test/test_dns.pyc
 ${PYSITELIB}/twisted/names/test/test_dns.pyo
+${PYSITELIB}/twisted/names/test/test_examples.py
+${PYSITELIB}/twisted/names/test/test_examples.pyc
+${PYSITELIB}/twisted/names/test/test_examples.pyo
 ${PYSITELIB}/twisted/names/test/test_hosts.py
 ${PYSITELIB}/twisted/names/test/test_hosts.pyc
 ${PYSITELIB}/twisted/names/test/test_hosts.pyo
@@ -1249,8 +1246,6 @@ ${PYSITELIB}/twisted/protocols/wire.pyo
 ${PYSITELIB}/twisted/python/__init__.py
 ${PYSITELIB}/twisted/python/__init__.pyc
 ${PYSITELIB}/twisted/python/__init__.pyo
-${PYSITELIB}/twisted/python/_epoll.c
-${PYSITELIB}/twisted/python/_epoll.pyx
 ${PYSITELIB}/twisted/python/_initgroups.c
 ${PLIST.initgroups}${PYSITELIB}/twisted/python/_initgroups.so
 ${PYSITELIB}/twisted/python/_inotify.py
@@ -1265,9 +1260,9 @@ ${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/_textattributes.py
+${PYSITELIB}/twisted/python/_textattributes.pyc
+${PYSITELIB}/twisted/python/_textattributes.pyo
 ${PYSITELIB}/twisted/python/compat.py
 ${PYSITELIB}/twisted/python/compat.pyc
 ${PYSITELIB}/twisted/python/compat.pyo
@@ -1414,15 +1409,15 @@ ${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_textattributes.py
+${PYSITELIB}/twisted/python/test/test_textattributes.pyc
+${PYSITELIB}/twisted/python/test/test_textattributes.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
@@ -1435,9 +1430,6 @@ ${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
-${PYSITELIB}/twisted/python/test/test_zshcomp.py
-${PYSITELIB}/twisted/python/test/test_zshcomp.pyc
-${PYSITELIB}/twisted/python/test/test_zshcomp.pyo
 ${PYSITELIB}/twisted/python/text.py
 ${PYSITELIB}/twisted/python/text.pyc
 ${PYSITELIB}/twisted/python/text.pyo
@@ -1485,9 +1477,6 @@ ${PYSITELIB}/twisted/python/zsh/_tkmktap
 ${PYSITELIB}/twisted/python/zsh/_trial
 ${PYSITELIB}/twisted/python/zsh/_twistd
 ${PYSITELIB}/twisted/python/zsh/_websetroot
-${PYSITELIB}/twisted/python/zshcomp.py
-${PYSITELIB}/twisted/python/zshcomp.pyc
-${PYSITELIB}/twisted/python/zshcomp.pyo
 ${PYSITELIB}/twisted/runner/__init__.py
 ${PYSITELIB}/twisted/runner/__init__.pyc
 ${PYSITELIB}/twisted/runner/__init__.pyo
@@ -1764,9 +1753,6 @@ ${PYSITELIB}/twisted/test/test_dirdbm.pyo
 ${PYSITELIB}/twisted/test/test_doc.py
 ${PYSITELIB}/twisted/test/test_doc.pyc
 ${PYSITELIB}/twisted/test/test_doc.pyo
-${PYSITELIB}/twisted/test/test_epoll.py
-${PYSITELIB}/twisted/test/test_epoll.pyc
-${PYSITELIB}/twisted/test/test_epoll.pyo
 ${PYSITELIB}/twisted/test/test_error.py
 ${PYSITELIB}/twisted/test/test_error.pyc
 ${PYSITELIB}/twisted/test/test_error.pyo
@@ -1984,9 +1970,6 @@ ${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
@@ -2071,7 +2054,6 @@ ${PYSITELIB}/twisted/trial/test/moduleself.pyo
 ${PYSITELIB}/twisted/trial/test/moduletest.py
 ${PYSITELIB}/twisted/trial/test/moduletest.pyc
 ${PYSITELIB}/twisted/trial/test/moduletest.pyo
-${PYSITELIB}/twisted/trial/test/notpython
 ${PYSITELIB}/twisted/trial/test/novars.py
 ${PYSITELIB}/twisted/trial/test/novars.pyc
 ${PYSITELIB}/twisted/trial/test/novars.pyo
@@ -2132,9 +2114,6 @@ ${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
 ${PYSITELIB}/twisted/trial/test/test_testcase.py
 ${PYSITELIB}/twisted/trial/test/test_testcase.pyc
 ${PYSITELIB}/twisted/trial/test/test_testcase.pyo
diff --git a/net/py-twisted/distinfo b/net/py-twisted/distinfo
index f61268321ee..db2cecdf32a 100644
--- a/net/py-twisted/distinfo
+++ b/net/py-twisted/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2013/02/17 14:53:13 gdt Exp $
+$NetBSD: distinfo,v 1.12 2013/08/13 17:47:41 adam Exp $
 
-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 (Twisted-13.1.0.tar.bz2) = 7f6e07b8098b248157ac26378fafa9e018f279a7
+RMD160 (Twisted-13.1.0.tar.bz2) = fb4e6c4cbdd7a32d3702544c27beb75737241b57
+Size (Twisted-13.1.0.tar.bz2) = 2678426 bytes
 SHA1 (patch-ab) = 26495e5abd57025e915b923cc7089704bbd85629