Changes 10.1.0:

* Add linux inotify support, allowing monitoring of file system
  events.
* Deferreds now support cancellation.
* Added new "endpoint" interfaces in twisted.internet.interfaces,
  which abstractly describe stream transport endpoints which can be
  listened on or connected to.  Implementations for TCP and SSL
  clients and servers are present in twisted.internet.endpoints.
  Notably, client endpoints' connect() methods return cancellable
  Deferreds, so code written to use them can bypass the awkward
  "ClientFactory.clientConnectionFailed" and
  "Connector.stopConnecting" methods, and handle errbacks from or
  cancel the returned deferred, respectively.
* twisted.protocols.amp.Integer's documentation now clarifies that
  integers of arbitrary size are supported and that the wire format
  is a base-10 representation.
* twisted.protocols.amp now includes support for transferring
  timestamps (amp.DateTime) and decimal values (amp.Decimal).
* twisted.protocol.ftp.IWriteFile now has a close() method, which can
  return a Deferred. Previously a STOR command would finish
  immediately upon the receipt of the last byte of the uploaded file.
  With close(), the backend can delay the finish until it has
  performed some other slow action (like storing the data to a
  virtual filesystem).
* FilePath now calls os.stat() only when new status information is
  required, rather than immediately when anything changes.  For some
  applications this may result in fewer stat() calls.  Additionally,
  FilePath has a new method, 'changed', which applications may use to
  indicate that the FilePath may have been changed on disk and
  therefore the next status information request must  fetch a new
  stat result.  This is useful if external systems, such as C
  libraries, may have changed files that Twisted applications are
  referencing via a FilePath.
* Documentation improvements are now summarized in the NEWS file.
* twisted.internet.task.deferLater now returns a cancellable
  Deferred.
* The connect methods of twisted.internet.protocol.ClientCreator now
  return cancellable Deferreds.
* twisted.spread.pb now has documentation covering some of its
  limitations.
* twisted.spread.jelly now supports jellying and unjellying classes
  defined with slots if they also implement __getstate__ and
  __setstate__.
* twisted.protocols.amp.ListOf arguments can now be specified as
  optional.
* Bugfixes

6 files changed, 79 insertions, 27 deletions

diff --git a/net/py-twisted-docs/Makefile b/net/py-twisted-docs/Makefile
index 89b0a64b6e5..ac5e44d8012 100644
--- a/net/py-twisted-docs/Makefile
+++ b/net/py-twisted-docs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2009/07/08 12:16:45 reed Exp $
+# $NetBSD: Makefile,v 1.12 2010/11/04 19:40:02 adam Exp $
 
-PKGNAME=		py-twisted-docs-${TWISTED_VERSION}
-COMMENT=		Framework for writing networked applications (documentation)
+PKGNAME=	py-twisted-docs-${TWISTED_VERSION}
+COMMENT=	Framework for writing networked applications (documentation)
 .include "../../net/py-twisted/Makefile.common"
 
 NO_CONFIGURE=	yes
diff --git a/net/py-twisted/Makefile b/net/py-twisted/Makefile
index 3455f7d72ee..178a9f07436 100644
--- a/net/py-twisted/Makefile
+++ b/net/py-twisted/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2010/03/06 13:18:07 obache Exp $
-#
+# $NetBSD: Makefile,v 1.17 2010/11/04 19:40:02 adam Exp $
 
-PKGNAME=		${PYPKGPREFIX}-twisted-${TWISTED_VERSION}
-COMMENT=		Framework for writing networked applications
+PKGNAME=	${PYPKGPREFIX}-twisted-${TWISTED_VERSION}
+COMMENT=	Framework for writing networked applications
 .include "../../net/py-twisted/Makefile.common"
 
-DEPENDS+=		${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL
-DEPENDS+=		${PYPKGPREFIX}-ZopeInterface>=3.0.1:../../devel/py-ZopeInterface
+DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL
+DEPENDS+=	${PYPKGPREFIX}-ZopeInterface>=3.0.1:../../devel/py-ZopeInterface
 
 # bin/cftp
 CONFLICTS+=		cftp-[0-9]*
@@ -15,11 +14,15 @@ REPLACE_PYTHON+=	twisted/mail/test/pop3testserver.py
 REPLACE_PYTHON+=	twisted/trial/test/scripttest.py
 REPLACE_PYTHON+=	twisted/topfiles/setup.py
 
+post-patch:
+	rm ${WRKSRC}/twisted/runner/portmap.c.orig
+	rm ${WRKSRC}/twisted/test/generator_failure_tests.py.orig
+
 do-test:
 	cd ${WRKSRC} && ./build/scripts-${PYVERSSUFFIX}/trial twisted
 
 # created during self test.
-CHECK_FILES_SKIP=	${PREFIX}/${PYSITELIB}/twisted/plugins/dropin.cache
+CHECK_FILES_SKIP+=	${PREFIX}/${PYSITELIB}/twisted/plugins/dropin.cache
 
 # egg.mk restricts the Python version list
 .include "../../lang/python/egg.mk"
diff --git a/net/py-twisted/Makefile.common b/net/py-twisted/Makefile.common
index 0561caf6222..023a01d7360 100644
--- a/net/py-twisted/Makefile.common
+++ b/net/py-twisted/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.6 2010/03/06 13:18:07 obache Exp $
+# $NetBSD: Makefile.common,v 1.7 2010/11/04 19:40:02 adam Exp $
 # used by net/py-twisted/Makefile
 # used by net/py-twisted-docs/Makefile
 
-TWISTED_VERSION=	10.0.0
+TWISTED_VERSION=	10.1.0
 DISTNAME=		Twisted-${TWISTED_VERSION}
 CATEGORIES=		net python
-MASTER_SITES=		http://tmrc.mit.edu/mirror/twisted/Twisted/10.0/
+MASTER_SITES=		http://tmrc.mit.edu/mirror/twisted/Twisted/10.1/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/net/py-twisted/PLIST b/net/py-twisted/PLIST
index 2d8bea84f27..adc1625f387 100644
--- a/net/py-twisted/PLIST
+++ b/net/py-twisted/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2010/03/06 13:18:07 obache Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/11/04 19:40:02 adam Exp $
 bin/cftp
 bin/ckeygen
 bin/conch
@@ -151,9 +151,6 @@ ${PYSITELIB}/twisted/conch/ssh/__init__.pyo
 ${PYSITELIB}/twisted/conch/ssh/agent.py
 ${PYSITELIB}/twisted/conch/ssh/agent.pyc
 ${PYSITELIB}/twisted/conch/ssh/agent.pyo
-${PYSITELIB}/twisted/conch/ssh/asn1.py
-${PYSITELIB}/twisted/conch/ssh/asn1.pyc
-${PYSITELIB}/twisted/conch/ssh/asn1.pyo
 ${PYSITELIB}/twisted/conch/ssh/channel.py
 ${PYSITELIB}/twisted/conch/ssh/channel.pyc
 ${PYSITELIB}/twisted/conch/ssh/channel.pyo
@@ -354,9 +351,6 @@ ${PYSITELIB}/twisted/internet/_baseprocess.pyo
 ${PYSITELIB}/twisted/internet/_dumbwin32proc.py
 ${PYSITELIB}/twisted/internet/_dumbwin32proc.pyc
 ${PYSITELIB}/twisted/internet/_dumbwin32proc.pyo
-${PYSITELIB}/twisted/internet/_javaserialport.py
-${PYSITELIB}/twisted/internet/_javaserialport.pyc
-${PYSITELIB}/twisted/internet/_javaserialport.pyo
 ${PYSITELIB}/twisted/internet/_pollingfile.py
 ${PYSITELIB}/twisted/internet/_pollingfile.pyc
 ${PYSITELIB}/twisted/internet/_pollingfile.pyo
@@ -366,6 +360,11 @@ ${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
 ${PYSITELIB}/twisted/internet/_sslverify.py
 ${PYSITELIB}/twisted/internet/_sslverify.pyc
 ${PYSITELIB}/twisted/internet/_sslverify.pyo
@@ -403,6 +402,9 @@ ${PYSITELIB}/twisted/internet/default.pyo
 ${PYSITELIB}/twisted/internet/defer.py
 ${PYSITELIB}/twisted/internet/defer.pyc
 ${PYSITELIB}/twisted/internet/defer.pyo
+${PYSITELIB}/twisted/internet/endpoints.py
+${PYSITELIB}/twisted/internet/endpoints.pyc
+${PYSITELIB}/twisted/internet/endpoints.pyo
 ${PYSITELIB}/twisted/internet/epollreactor.py
 ${PYSITELIB}/twisted/internet/epollreactor.pyc
 ${PYSITELIB}/twisted/internet/epollreactor.pyo
@@ -421,6 +423,9 @@ ${PYSITELIB}/twisted/internet/gtk2reactor.pyo
 ${PYSITELIB}/twisted/internet/gtkreactor.py
 ${PYSITELIB}/twisted/internet/gtkreactor.pyc
 ${PYSITELIB}/twisted/internet/gtkreactor.pyo
+${PYSITELIB}/twisted/internet/inotify.py
+${PYSITELIB}/twisted/internet/inotify.pyc
+${PYSITELIB}/twisted/internet/inotify.pyo
 ${PYSITELIB}/twisted/internet/interfaces.py
 ${PYSITELIB}/twisted/internet/interfaces.pyc
 ${PYSITELIB}/twisted/internet/interfaces.pyo
@@ -515,6 +520,9 @@ ${PYSITELIB}/twisted/internet/test/process_helper.pyo
 ${PYSITELIB}/twisted/internet/test/reactormixins.py
 ${PYSITELIB}/twisted/internet/test/reactormixins.pyc
 ${PYSITELIB}/twisted/internet/test/reactormixins.pyo
+${PYSITELIB}/twisted/internet/test/test_address.py
+${PYSITELIB}/twisted/internet/test/test_address.pyc
+${PYSITELIB}/twisted/internet/test/test_address.pyo
 ${PYSITELIB}/twisted/internet/test/test_base.py
 ${PYSITELIB}/twisted/internet/test/test_base.pyc
 ${PYSITELIB}/twisted/internet/test/test_base.pyo
@@ -524,12 +532,21 @@ ${PYSITELIB}/twisted/internet/test/test_baseprocess.pyo
 ${PYSITELIB}/twisted/internet/test/test_core.py
 ${PYSITELIB}/twisted/internet/test/test_core.pyc
 ${PYSITELIB}/twisted/internet/test/test_core.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_fdset.py
 ${PYSITELIB}/twisted/internet/test/test_fdset.pyc
 ${PYSITELIB}/twisted/internet/test/test_fdset.pyo
+${PYSITELIB}/twisted/internet/test/test_gtkreactor.py
+${PYSITELIB}/twisted/internet/test/test_gtkreactor.pyc
+${PYSITELIB}/twisted/internet/test/test_gtkreactor.pyo
 ${PYSITELIB}/twisted/internet/test/test_inlinecb.py
 ${PYSITELIB}/twisted/internet/test/test_inlinecb.pyc
 ${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_iocp.py
 ${PYSITELIB}/twisted/internet/test/test_iocp.pyc
 ${PYSITELIB}/twisted/internet/test/test_iocp.pyo
@@ -542,9 +559,15 @@ ${PYSITELIB}/twisted/internet/test/test_posixbase.pyo
 ${PYSITELIB}/twisted/internet/test/test_process.py
 ${PYSITELIB}/twisted/internet/test/test_process.pyc
 ${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_qtreactor.py
 ${PYSITELIB}/twisted/internet/test/test_qtreactor.pyc
 ${PYSITELIB}/twisted/internet/test/test_qtreactor.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_tcp.py
 ${PYSITELIB}/twisted/internet/test/test_tcp.pyc
 ${PYSITELIB}/twisted/internet/test/test_tcp.pyo
@@ -1013,6 +1036,9 @@ ${PYSITELIB}/twisted/plugins/twisted_qtstub.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
@@ -1121,6 +1147,9 @@ ${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/_release.py
 ${PYSITELIB}/twisted/python/_release.pyc
 ${PYSITELIB}/twisted/python/_release.pyo
@@ -1239,6 +1268,9 @@ ${PYSITELIB}/twisted/python/test/test_hashlib.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_release.py
 ${PYSITELIB}/twisted/python/test/test_release.pyc
 ${PYSITELIB}/twisted/python/test/test_release.pyo
@@ -1328,11 +1360,13 @@ ${PYSITELIB}/twisted/runner/inetdtap.py
 ${PYSITELIB}/twisted/runner/inetdtap.pyc
 ${PYSITELIB}/twisted/runner/inetdtap.pyo
 ${PYSITELIB}/twisted/runner/portmap.c
-${PYSITELIB}/twisted/runner/portmap.c.orig
 ${PYSITELIB}/twisted/runner/portmap.so
 ${PYSITELIB}/twisted/runner/procmon.py
 ${PYSITELIB}/twisted/runner/procmon.pyc
 ${PYSITELIB}/twisted/runner/procmon.pyo
+${PYSITELIB}/twisted/runner/procmontap.py
+${PYSITELIB}/twisted/runner/procmontap.pyc
+${PYSITELIB}/twisted/runner/procmontap.pyo
 ${PYSITELIB}/twisted/runner/procutils.py
 ${PYSITELIB}/twisted/runner/procutils.pyc
 ${PYSITELIB}/twisted/runner/procutils.pyo
@@ -1342,6 +1376,9 @@ ${PYSITELIB}/twisted/runner/test/__init__.pyo
 ${PYSITELIB}/twisted/runner/test/test_procmon.py
 ${PYSITELIB}/twisted/runner/test/test_procmon.pyc
 ${PYSITELIB}/twisted/runner/test/test_procmon.pyo
+${PYSITELIB}/twisted/runner/test/test_procmontap.py
+${PYSITELIB}/twisted/runner/test/test_procmontap.pyc
+${PYSITELIB}/twisted/runner/test/test_procmontap.pyo
 ${PYSITELIB}/twisted/runner/topfiles/NEWS
 ${PYSITELIB}/twisted/runner/topfiles/README
 ${PYSITELIB}/twisted/scripts/__init__.py
@@ -1377,6 +1414,9 @@ ${PYSITELIB}/twisted/scripts/test/__init__.pyo
 ${PYSITELIB}/twisted/scripts/test/test_mktap.py
 ${PYSITELIB}/twisted/scripts/test/test_mktap.pyc
 ${PYSITELIB}/twisted/scripts/test/test_mktap.pyo
+${PYSITELIB}/twisted/scripts/test/test_tap2rpm.py
+${PYSITELIB}/twisted/scripts/test/test_tap2rpm.pyc
+${PYSITELIB}/twisted/scripts/test/test_tap2rpm.pyo
 ${PYSITELIB}/twisted/scripts/tkunzip.py
 ${PYSITELIB}/twisted/scripts/tkunzip.pyc
 ${PYSITELIB}/twisted/scripts/tkunzip.pyo
@@ -1451,7 +1491,6 @@ ${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.py.orig
 ${PYSITELIB}/twisted/test/generator_failure_tests.pyc
 ${PYSITELIB}/twisted/test/generator_failure_tests.pyo
 ${PYSITELIB}/twisted/test/iosim.py
@@ -1527,6 +1566,9 @@ ${PYSITELIB}/twisted/test/ssl_helpers.pyo
 ${PYSITELIB}/twisted/test/stdio_test_consumer.py
 ${PYSITELIB}/twisted/test/stdio_test_consumer.pyc
 ${PYSITELIB}/twisted/test/stdio_test_consumer.pyo
+${PYSITELIB}/twisted/test/stdio_test_halfclose.py
+${PYSITELIB}/twisted/test/stdio_test_halfclose.pyc
+${PYSITELIB}/twisted/test/stdio_test_halfclose.pyo
 ${PYSITELIB}/twisted/test/stdio_test_hostpeer.py
 ${PYSITELIB}/twisted/test/stdio_test_hostpeer.pyc
 ${PYSITELIB}/twisted/test/stdio_test_hostpeer.pyo
@@ -1806,7 +1848,6 @@ ${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/4335.misc
 ${PYSITELIB}/twisted/topfiles/CREDITS
 ${PYSITELIB}/twisted/topfiles/ChangeLog.Old
 ${PYSITELIB}/twisted/topfiles/NEWS
@@ -2058,6 +2099,9 @@ ${PYSITELIB}/twisted/web/test/test_static.pyo
 ${PYSITELIB}/twisted/web/test/test_tap.py
 ${PYSITELIB}/twisted/web/test/test_tap.pyc
 ${PYSITELIB}/twisted/web/test/test_tap.pyo
+${PYSITELIB}/twisted/web/test/test_util.py
+${PYSITELIB}/twisted/web/test/test_util.pyc
+${PYSITELIB}/twisted/web/test/test_util.pyo
 ${PYSITELIB}/twisted/web/test/test_vhost.py
 ${PYSITELIB}/twisted/web/test/test_vhost.pyc
 ${PYSITELIB}/twisted/web/test/test_vhost.pyo
@@ -2199,6 +2243,9 @@ ${PYSITELIB}/twisted/words/tap.pyo
 ${PYSITELIB}/twisted/words/test/__init__.py
 ${PYSITELIB}/twisted/words/test/__init__.pyc
 ${PYSITELIB}/twisted/words/test/__init__.pyo
+${PYSITELIB}/twisted/words/test/test_basechat.py
+${PYSITELIB}/twisted/words/test/test_basechat.pyc
+${PYSITELIB}/twisted/words/test/test_basechat.pyo
 ${PYSITELIB}/twisted/words/test/test_basesupport.py
 ${PYSITELIB}/twisted/words/test/test_basesupport.pyc
 ${PYSITELIB}/twisted/words/test/test_basesupport.pyo
diff --git a/net/py-twisted/PLIST.Darwin b/net/py-twisted/PLIST.Darwin
new file mode 100644
index 00000000000..18a2724b3da
--- /dev/null
+++ b/net/py-twisted/PLIST.Darwin
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2010/11/04 19:40:02 adam Exp $
+${PYSITELIB}/twisted/internet/cfsupport.so
diff --git a/net/py-twisted/distinfo b/net/py-twisted/distinfo
index d23830926a9..4a679fc08cc 100644
--- a/net/py-twisted/distinfo
+++ b/net/py-twisted/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2010/03/06 13:18:07 obache Exp $
+$NetBSD: distinfo,v 1.8 2010/11/04 19:40:02 adam Exp $
 
-SHA1 (Twisted-10.0.0.tar.bz2) = 8d48d78323ce7a1ccc8b02c55b693389d50b3bc3
-RMD160 (Twisted-10.0.0.tar.bz2) = 4c006305e5cbd1e46ac7f9e2581e69714e94af18
-Size (Twisted-10.0.0.tar.bz2) = 2583372 bytes
+SHA1 (Twisted-10.1.0.tar.bz2) = ad5a6d60c0d0316bd1b95566fd3ddb598ddd52e6
+RMD160 (Twisted-10.1.0.tar.bz2) = a344f9c4de66fdea1c1ef13194f4d4ce9b778139
+Size (Twisted-10.1.0.tar.bz2) = 2642152 bytes
 SHA1 (patch-ab) = 26495e5abd57025e915b923cc7089704bbd85629
 SHA1 (patch-ac) = 3881dec501db0913a600bde78e6d96a106c33156