pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/net/py-twisted



Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Oct 19 08:50:34 UTC 2017

Modified Files:
        pkgsrc/net/py-twisted: Makefile Makefile.common PLIST distinfo

Log Message:
py-twisted: update to 17.9.0

Twisted 17.9.0:

Features
--------
- twisted.python.failure.Failure is now a new-style class which subclasses
  BaseException.
- twisted.internet.posixbase.PosixReactorBase.adoptStreamPort and
  twisted.internet.posixbase.PosixReactorBase.adoptStreamConnection now support
  AF_UNIX SOCK_STREAM sockets.
-
- t.protocol.policies.TimeoutMixin.setTimeout and
  t.protocol.policies.TimeoutProtocol.cancelTimeout (used in
  t.protocol.policies.TimeoutFactory) no longer raise a
  t.internet.error.AlreadyCancelled exception when calling them for an already
  cancelled timeout.
- twisted.web.template.flatten now supports coroutines that yield Deferreds.

- twisted.web.client.HTTPConnectionPool passes the repr() of the endpoint to
  the client protocol factory, and the protocol factory adds that to its own
  repr(). This makes logs more useful.
- Python 3.6 is now supported

Bugfixes
--------
- twisted.python.logfile.BaseLogFile and subclasses now always open the file in
  binary mode, and will process text as UTF-8.
- The `ssl:` endpoint now accepts `certKey` PEM files without trailing
  newlines.
- Logger.__init__ sets the namespace to "<unknown>" instead of raising KeyError
  when unable to determine the namespace from the calling context.
- twisted.internet._win32serialport updated to support pySerial 3.x and dropped
  pySerial 2.x support.
- twisted.python.rebuild now works on Python 3.
- twisted.web.server.Request.notifyFinish will now once again promptly notify
  applications of client disconnection (assuming that the client doesn't send a
  large amount of pipelined request data) rather than waiting for the timeout;
  this fixes a bug introduced in Twisted 16.3.0.
- twisted.web.guard.HTTPAuthSessionWrapper configured with
  DigestCredentialFactory now works on both Python 2 and 3.
- Detect when we’re being run using “-m twisted” or “-m twisted.trial” and use
  it to build an accurate usage message.
- twisted.protocols.tls.TLSMemoryBIOProtocol now allows unregisterProducer to
  be called when no producer is registered, bringing it in line with other
  transports.
- twisted.web web servers no longer print tracebacks when they timeout clients
  that do not respond to TLS CLOSE_NOTIFY messages.
- twisted.mail.imap4 now works on Python 3.
- twisted.python.shortcut now works on Python 3 in Windows.
- Fix traceback forwarding with inlineCallbacks on python 3.
- twisted.mail.imap4.MessageSet now treats * as larger than every message ID,
  leading to more consistent and robust behavior.
- The following plugins can now be used on Python 3 with twistd: dns, inetd,
  portforward, procmon, socks, and words.
- twisted.internet._win32serialport now uses serial.serialutil.to_bytes() to
  provide bytes in Python 3.
- twisted.internet.reactor.spawnProcess() now does not fail on Python 3 in
  Windows if passed a bytes-encoded path argument.
- twisted.protocols.ident now works on Python 3.
- Ignore PyPy's implementation differences in base object class.
- twisted.python.test.test_setup now passes with setuptools 36.2.1
- twisted.internet._win32serialport SerialPort._clearCommError() no longer
  raises AttributeError
- twisted.trial.unittest.SynchronousTestCase and
  twisted.trial.unittest.TestCase now always run their tearDown methods, even
  when a test method fails with an exception. They also flush all errors logged
  by a test method before running another, ensuring the logged errors are
  associated with their originating test method.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/py-twisted/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/net/py-twisted/Makefile.common
cvs rdiff -u -r1.28 -r1.29 pkgsrc/net/py-twisted/PLIST
cvs rdiff -u -r1.33 -r1.34 pkgsrc/net/py-twisted/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/py-twisted/Makefile
diff -u pkgsrc/net/py-twisted/Makefile:1.34 pkgsrc/net/py-twisted/Makefile:1.35
--- pkgsrc/net/py-twisted/Makefile:1.34 Wed Jun 21 18:35:35 2017
+++ pkgsrc/net/py-twisted/Makefile      Thu Oct 19 08:50:34 2017
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.34 2017/06/21 18:35:35 adam Exp $
+# $NetBSD: Makefile,v 1.35 2017/10/19 08:50:34 adam Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
 COMMENT=       Framework for writing networked applications
 .include "../../net/py-twisted/Makefile.common"
 
-DEPENDS+=      ${PYPKGPREFIX}-automat-[0-9]*:../../devel/py-automat
-DEPENDS+=      ${PYPKGPREFIX}-constantly-[0-9]*:../../devel/py-constantly
-DEPENDS+=      ${PYPKGPREFIX}-hyperlink-[0-9]*:../../www/py-hyperlink
-DEPENDS+=      ${PYPKGPREFIX}-incremental-[0-9]*:../../devel/py-incremental
-DEPENDS+=      ${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL
+DEPENDS+=      ${PYPKGPREFIX}-automat>=0.3.0:../../devel/py-automat
+DEPENDS+=      ${PYPKGPREFIX}-constantly>=15.1:../../devel/py-constantly
+DEPENDS+=      ${PYPKGPREFIX}-hyperlink>=17.1.1:../../www/py-hyperlink
+DEPENDS+=      ${PYPKGPREFIX}-idna>=2.4:../../devel/py-incremental
+DEPENDS+=      ${PYPKGPREFIX}-incremental>=16.10.1:../../devel/py-incremental
+DEPENDS+=      ${PYPKGPREFIX}-OpenSSL>=16.0.0:../../security/py-OpenSSL
 DEPENDS+=      ${PYPKGPREFIX}-service_identity-[0-9]*:../../security/py-service_identity
 DEPENDS+=      ${PYPKGPREFIX}-ZopeInterface>=3.0.1:../../devel/py-ZopeInterface
 
@@ -21,17 +22,9 @@ CFLAGS.SunOS+=       -D_XOPEN_SOURCE=1 -D_XOPE
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        for i in cftp ckeygen conch mailmail pyhtmlizer tkconch trial twist twistd; do \
-               ${MV} $$i $$i-${PYVERSSUFFIX}; \
+               ${MV} $$i $$i-${PYVERSSUFFIX} || ${TRUE}; \
        done
 
-# 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
-
-# created during self test.
-CHECK_FILES_SKIP+=     ${PREFIX}/${PYSITELIB}/twisted/plugins/dropin.cache
-
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-twisted/Makefile.common
diff -u pkgsrc/net/py-twisted/Makefile.common:1.39 pkgsrc/net/py-twisted/Makefile.common:1.40
--- pkgsrc/net/py-twisted/Makefile.common:1.39  Wed Jun 21 18:35:35 2017
+++ pkgsrc/net/py-twisted/Makefile.common       Thu Oct 19 08:50:34 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.39 2017/06/21 18:35:35 adam Exp $
+# $NetBSD: Makefile.common,v 1.40 2017/10/19 08:50:34 adam Exp $
 #
 # used by net/py-twisted/Makefile
 # used by net/py-twisted-docs/Makefile
 
-DISTNAME=      Twisted-17.5.0
+DISTNAME=      Twisted-17.9.0
 CATEGORIES=    net python
 MASTER_SITES=  http://twistedmatrix.com/Releases/Twisted/${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/net/py-twisted/PLIST
diff -u pkgsrc/net/py-twisted/PLIST:1.28 pkgsrc/net/py-twisted/PLIST:1.29
--- pkgsrc/net/py-twisted/PLIST:1.28    Wed Jun 21 18:35:35 2017
+++ pkgsrc/net/py-twisted/PLIST Thu Oct 19 08:50:34 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2017/06/21 18:35:35 adam Exp $
+@comment $NetBSD: PLIST,v 1.29 2017/10/19 08:50:34 adam Exp $
 bin/cftp-${PYVERSSUFFIX}
 bin/ckeygen-${PYVERSSUFFIX}
 bin/conch-${PYVERSSUFFIX}
@@ -87,9 +87,6 @@ ${PYSITELIB}/twisted/application/runner/
 ${PYSITELIB}/twisted/application/runner/test/__init__.py
 ${PYSITELIB}/twisted/application/runner/test/__init__.pyc
 ${PYSITELIB}/twisted/application/runner/test/__init__.pyo
-${PYSITELIB}/twisted/application/runner/test/mockreactor.py
-${PYSITELIB}/twisted/application/runner/test/mockreactor.pyc
-${PYSITELIB}/twisted/application/runner/test/mockreactor.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
@@ -237,9 +234,6 @@ ${PYSITELIB}/twisted/conch/scripts/tkcon
 ${PYSITELIB}/twisted/conch/ssh/__init__.py
 ${PYSITELIB}/twisted/conch/ssh/__init__.pyc
 ${PYSITELIB}/twisted/conch/ssh/__init__.pyo
-${PYSITELIB}/twisted/conch/ssh/_cryptography_backports.py
-${PYSITELIB}/twisted/conch/ssh/_cryptography_backports.pyc
-${PYSITELIB}/twisted/conch/ssh/_cryptography_backports.pyo
 ${PYSITELIB}/twisted/conch/ssh/_kex.py
 ${PYSITELIB}/twisted/conch/ssh/_kex.pyc
 ${PYSITELIB}/twisted/conch/ssh/_kex.pyo
@@ -543,12 +537,12 @@ ${PYSITELIB}/twisted/internet/fdesc.pyo
 ${PYSITELIB}/twisted/internet/gireactor.py
 ${PYSITELIB}/twisted/internet/gireactor.pyc
 ${PYSITELIB}/twisted/internet/gireactor.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/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
@@ -610,9 +604,9 @@ ${PYSITELIB}/twisted/internet/process.py
 ${PYSITELIB}/twisted/internet/protocol.py
 ${PYSITELIB}/twisted/internet/protocol.pyc
 ${PYSITELIB}/twisted/internet/protocol.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/pyuisupport.py
+${PYSITELIB}/twisted/internet/pyuisupport.pyc
+${PYSITELIB}/twisted/internet/pyuisupport.pyo
 ${PYSITELIB}/twisted/internet/reactor.py
 ${PYSITELIB}/twisted/internet/reactor.pyc
 ${PYSITELIB}/twisted/internet/reactor.pyo
@@ -662,12 +656,12 @@ ${PYSITELIB}/twisted/internet/test/modul
 ${PYSITELIB}/twisted/internet/test/process_cli.py
 ${PYSITELIB}/twisted/internet/test/process_cli.pyc
 ${PYSITELIB}/twisted/internet/test/process_cli.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_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
 ${PYSITELIB}/twisted/internet/test/process_helper.py
 ${PYSITELIB}/twisted/internet/test/process_helper.pyc
 ${PYSITELIB}/twisted/internet/test/process_helper.pyo
@@ -785,12 +779,15 @@ ${PYSITELIB}/twisted/internet/test/test_
 ${PYSITELIB}/twisted/internet/test/test_win32events.py
 ${PYSITELIB}/twisted/internet/test/test_win32events.pyc
 ${PYSITELIB}/twisted/internet/test/test_win32events.pyo
+${PYSITELIB}/twisted/internet/test/test_win32serialport.py
+${PYSITELIB}/twisted/internet/test/test_win32serialport.pyc
+${PYSITELIB}/twisted/internet/test/test_win32serialport.pyo
 ${PYSITELIB}/twisted/internet/threads.py
 ${PYSITELIB}/twisted/internet/threads.pyc
 ${PYSITELIB}/twisted/internet/threads.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/tksupport.py
+${PYSITELIB}/twisted/internet/tksupport.pyc
+${PYSITELIB}/twisted/internet/tksupport.pyo
 ${PYSITELIB}/twisted/internet/udp.py
 ${PYSITELIB}/twisted/internet/udp.pyc
 ${PYSITELIB}/twisted/internet/udp.pyo
@@ -914,9 +911,9 @@ ${PLIST.py2x}${PYSITELIB}/twisted/mail/a
 ${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/imap4.py
+${PYSITELIB}/twisted/mail/imap4.pyc
+${PYSITELIB}/twisted/mail/imap4.pyo
 ${PYSITELIB}/twisted/mail/interfaces.py
 ${PYSITELIB}/twisted/mail/interfaces.pyc
 ${PYSITELIB}/twisted/mail/interfaces.pyo
@@ -966,9 +963,9 @@ ${PYSITELIB}/twisted/mail/test/rfc822.me
 ${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
+${PYSITELIB}/twisted/mail/test/test_imap.py
+${PYSITELIB}/twisted/mail/test/test_imap.pyc
+${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
@@ -1197,39 +1194,39 @@ ${PYSITELIB}/twisted/plugins/twisted_cor
 ${PYSITELIB}/twisted/plugins/twisted_ftp.py
 ${PYSITELIB}/twisted/plugins/twisted_ftp.pyc
 ${PYSITELIB}/twisted/plugins/twisted_ftp.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
+${PYSITELIB}/twisted/plugins/twisted_inet.py
+${PYSITELIB}/twisted/plugins/twisted_inet.pyc
+${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
+${PYSITELIB}/twisted/plugins/twisted_names.py
+${PYSITELIB}/twisted/plugins/twisted_names.pyc
+${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_portforward.py
+${PYSITELIB}/twisted/plugins/twisted_portforward.pyc
+${PYSITELIB}/twisted/plugins/twisted_portforward.pyo
 ${PYSITELIB}/twisted/plugins/twisted_reactors.py
 ${PYSITELIB}/twisted/plugins/twisted_reactors.pyc
 ${PYSITELIB}/twisted/plugins/twisted_reactors.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_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
 ${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
-${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/plugins/twisted_words.py
+${PYSITELIB}/twisted/plugins/twisted_words.pyc
+${PYSITELIB}/twisted/plugins/twisted_words.pyo
 ${PYSITELIB}/twisted/positioning/__init__.py
 ${PYSITELIB}/twisted/positioning/__init__.pyc
 ${PYSITELIB}/twisted/positioning/__init__.pyo
@@ -1320,9 +1317,9 @@ ${PYSITELIB}/twisted/protocols/haproxy/t
 ${PYSITELIB}/twisted/protocols/htb.py
 ${PYSITELIB}/twisted/protocols/htb.pyc
 ${PYSITELIB}/twisted/protocols/htb.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/ident.py
+${PYSITELIB}/twisted/protocols/ident.pyc
+${PYSITELIB}/twisted/protocols/ident.pyo
 ${PYSITELIB}/twisted/protocols/loopback.py
 ${PYSITELIB}/twisted/protocols/loopback.pyc
 ${PYSITELIB}/twisted/protocols/loopback.pyo
@@ -1392,9 +1389,9 @@ ${PLIST.py2x}${PYSITELIB}/twisted/python
 ${PYSITELIB}/twisted/python/_pydoctortemplates/common.html
 ${PYSITELIB}/twisted/python/_pydoctortemplates/index.html
 ${PYSITELIB}/twisted/python/_pydoctortemplates/summary.html
-${PLIST.py2x}${PYSITELIB}/twisted/python/_release.py
-${PLIST.py2x}${PYSITELIB}/twisted/python/_release.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/python/_release.pyo
+${PYSITELIB}/twisted/python/_release.py
+${PYSITELIB}/twisted/python/_release.pyc
+${PYSITELIB}/twisted/python/_release.pyo
 ${PYSITELIB}/twisted/python/_sendmsg.c
 ${PLIST.py2x}${PYSITELIB}/twisted/python/_sendmsg.so
 ${PYSITELIB}/twisted/python/_setup.py
@@ -1439,9 +1436,9 @@ ${PYSITELIB}/twisted/python/filepath.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
+${PYSITELIB}/twisted/python/formmethod.py
+${PYSITELIB}/twisted/python/formmethod.pyc
+${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
@@ -1469,15 +1466,15 @@ ${PYSITELIB}/twisted/python/procutils.py
 ${PYSITELIB}/twisted/python/randbytes.py
 ${PYSITELIB}/twisted/python/randbytes.pyc
 ${PYSITELIB}/twisted/python/randbytes.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/rebuild.py
+${PYSITELIB}/twisted/python/rebuild.pyc
+${PYSITELIB}/twisted/python/rebuild.pyo
 ${PYSITELIB}/twisted/python/reflect.py
 ${PYSITELIB}/twisted/python/reflect.pyc
 ${PYSITELIB}/twisted/python/reflect.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/release.py
+${PYSITELIB}/twisted/python/release.pyc
+${PYSITELIB}/twisted/python/release.pyo
 ${PYSITELIB}/twisted/python/roots.py
 ${PYSITELIB}/twisted/python/roots.pyc
 ${PYSITELIB}/twisted/python/roots.pyo
@@ -1487,9 +1484,9 @@ ${PYSITELIB}/twisted/python/runtime.pyo
 ${PYSITELIB}/twisted/python/sendmsg.py
 ${PYSITELIB}/twisted/python/sendmsg.pyc
 ${PYSITELIB}/twisted/python/sendmsg.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/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
@@ -1527,9 +1524,9 @@ ${PYSITELIB}/twisted/python/test/test_de
 ${PYSITELIB}/twisted/python/test/test_dist3.py
 ${PYSITELIB}/twisted/python/test/test_dist3.pyc
 ${PYSITELIB}/twisted/python/test/test_dist3.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_fakepwd.py
+${PYSITELIB}/twisted/python/test/test_fakepwd.pyc
+${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
@@ -1539,9 +1536,9 @@ ${PYSITELIB}/twisted/python/test/test_in
 ${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_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
@@ -1720,30 +1717,32 @@ ${PYSITELIB}/twisted/tap/__init__.pyo
 ${PYSITELIB}/twisted/tap/ftp.py
 ${PYSITELIB}/twisted/tap/ftp.pyc
 ${PYSITELIB}/twisted/tap/ftp.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/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
 ${PYSITELIB}/twisted/test/__init__.py
 ${PYSITELIB}/twisted/test/__init__.pyc
 ${PYSITELIB}/twisted/test/__init__.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/cert.pem.no_trailing_newline
+${PYSITELIB}/twisted/test/crash_test_dummy.py
+${PYSITELIB}/twisted/test/crash_test_dummy.pyc
+${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/key.pem.no_trailing_newline
 ${PYSITELIB}/twisted/test/mock_win32process.py
 ${PYSITELIB}/twisted/test/mock_win32process.pyc
 ${PYSITELIB}/twisted/test/mock_win32process.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/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
 ${PYSITELIB}/twisted/test/plugin_basic.py
 ${PYSITELIB}/twisted/test/plugin_basic.pyc
 ${PYSITELIB}/twisted/test/plugin_basic.pyo
@@ -1880,9 +1879,9 @@ ${PYSITELIB}/twisted/test/test_fdesc.pyo
 ${PYSITELIB}/twisted/test/test_finger.py
 ${PYSITELIB}/twisted/test/test_finger.pyc
 ${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_formmethod.py
+${PYSITELIB}/twisted/test/test_formmethod.pyc
+${PYSITELIB}/twisted/test/test_formmethod.pyo
 ${PYSITELIB}/twisted/test/test_ftp.py
 ${PYSITELIB}/twisted/test/test_ftp.pyc
 ${PYSITELIB}/twisted/test/test_ftp.pyo
@@ -1895,9 +1894,9 @@ ${PLIST.py2x}${PYSITELIB}/twisted/test/t
 ${PYSITELIB}/twisted/test/test_htb.py
 ${PYSITELIB}/twisted/test/test_htb.pyc
 ${PYSITELIB}/twisted/test/test_htb.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_ident.py
+${PYSITELIB}/twisted/test/test_ident.pyc
+${PYSITELIB}/twisted/test/test_ident.pyo
 ${PYSITELIB}/twisted/test/test_internet.py
 ${PYSITELIB}/twisted/test/test_internet.pyc
 ${PYSITELIB}/twisted/test/test_internet.pyo
@@ -1961,18 +1960,18 @@ ${PYSITELIB}/twisted/test/test_protocols
 ${PYSITELIB}/twisted/test/test_randbytes.py
 ${PYSITELIB}/twisted/test/test_randbytes.pyc
 ${PYSITELIB}/twisted/test/test_randbytes.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_rebuild.py
+${PYSITELIB}/twisted/test/test_rebuild.pyc
+${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
-${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_shortcut.py
+${PYSITELIB}/twisted/test/test_shortcut.pyc
+${PYSITELIB}/twisted/test/test_shortcut.pyo
 ${PYSITELIB}/twisted/test/test_sip.py
 ${PYSITELIB}/twisted/test/test_sip.pyc
 ${PYSITELIB}/twisted/test/test_sip.pyo
@@ -1994,9 +1993,9 @@ ${PYSITELIB}/twisted/test/test_stateful.
 ${PYSITELIB}/twisted/test/test_stdio.py
 ${PYSITELIB}/twisted/test/test_stdio.pyc
 ${PYSITELIB}/twisted/test/test_stdio.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_strerror.py
+${PYSITELIB}/twisted/test/test_strerror.pyc
+${PYSITELIB}/twisted/test/test_strerror.pyo
 ${PYSITELIB}/twisted/test/test_stringtransport.py
 ${PYSITELIB}/twisted/test/test_stringtransport.pyc
 ${PYSITELIB}/twisted/test/test_stringtransport.pyo
@@ -2270,9 +2269,9 @@ ${PYSITELIB}/twisted/web/demo.pyo
 ${PYSITELIB}/twisted/web/distrib.py
 ${PYSITELIB}/twisted/web/distrib.pyc
 ${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/domhelpers.py
+${PYSITELIB}/twisted/web/domhelpers.pyc
+${PYSITELIB}/twisted/web/domhelpers.pyo
 ${PYSITELIB}/twisted/web/error.py
 ${PYSITELIB}/twisted/web/error.pyc
 ${PYSITELIB}/twisted/web/error.pyo
@@ -2291,18 +2290,18 @@ ${PYSITELIB}/twisted/web/http_headers.py
 ${PYSITELIB}/twisted/web/iweb.py
 ${PYSITELIB}/twisted/web/iweb.pyc
 ${PYSITELIB}/twisted/web/iweb.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/microdom.py
+${PYSITELIB}/twisted/web/microdom.pyc
+${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
-${PLIST.py2x}${PYSITELIB}/twisted/web/rewrite.py
-${PLIST.py2x}${PYSITELIB}/twisted/web/rewrite.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/web/rewrite.pyo
+${PYSITELIB}/twisted/web/rewrite.py
+${PYSITELIB}/twisted/web/rewrite.pyc
+${PYSITELIB}/twisted/web/rewrite.pyo
 ${PYSITELIB}/twisted/web/script.py
 ${PYSITELIB}/twisted/web/script.pyc
 ${PYSITELIB}/twisted/web/script.pyo
@@ -2315,9 +2314,9 @@ ${PLIST.py2x}${PYSITELIB}/twisted/web/so
 ${PYSITELIB}/twisted/web/static.py
 ${PYSITELIB}/twisted/web/static.pyc
 ${PYSITELIB}/twisted/web/static.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/sux.py
+${PYSITELIB}/twisted/web/sux.pyc
+${PYSITELIB}/twisted/web/sux.pyo
 ${PYSITELIB}/twisted/web/tap.py
 ${PYSITELIB}/twisted/web/tap.pyc
 ${PYSITELIB}/twisted/web/tap.pyo
@@ -2339,21 +2338,24 @@ ${PYSITELIB}/twisted/web/test/test_agent
 ${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_client.py
+${PYSITELIB}/twisted/web/test/test_client.pyc
+${PYSITELIB}/twisted/web/test/test_client.pyo
 ${PYSITELIB}/twisted/web/test/test_distrib.py
 ${PYSITELIB}/twisted/web/test/test_distrib.pyc
 ${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_domhelpers.py
+${PYSITELIB}/twisted/web/test/test_domhelpers.pyc
+${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
-${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_html.py
+${PYSITELIB}/twisted/web/test/test_html.pyc
+${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
@@ -2411,9 +2413,9 @@ ${PYSITELIB}/twisted/web/test/test_webcl
 ${PYSITELIB}/twisted/web/test/test_wsgi.py
 ${PYSITELIB}/twisted/web/test/test_wsgi.pyc
 ${PYSITELIB}/twisted/web/test/test_wsgi.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_xml.py
+${PYSITELIB}/twisted/web/test/test_xml.pyc
+${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
@@ -2508,9 +2510,9 @@ ${PYSITELIB}/twisted/words/protocols/jab
 ${PYSITELIB}/twisted/words/service.py
 ${PYSITELIB}/twisted/words/service.pyc
 ${PYSITELIB}/twisted/words/service.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/tap.py
+${PYSITELIB}/twisted/words/tap.pyc
+${PYSITELIB}/twisted/words/tap.pyo
 ${PYSITELIB}/twisted/words/test/__init__.py
 ${PYSITELIB}/twisted/words/test/__init__.pyc
 ${PYSITELIB}/twisted/words/test/__init__.pyo
@@ -2562,9 +2564,9 @@ ${PYSITELIB}/twisted/words/test/test_jab
 ${PYSITELIB}/twisted/words/test/test_service.py
 ${PYSITELIB}/twisted/words/test/test_service.pyc
 ${PYSITELIB}/twisted/words/test/test_service.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_tap.py
+${PYSITELIB}/twisted/words/test/test_tap.pyc
+${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

Index: pkgsrc/net/py-twisted/distinfo
diff -u pkgsrc/net/py-twisted/distinfo:1.33 pkgsrc/net/py-twisted/distinfo:1.34
--- pkgsrc/net/py-twisted/distinfo:1.33 Wed Jun 21 18:35:35 2017
+++ pkgsrc/net/py-twisted/distinfo      Thu Oct 19 08:50:34 2017
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.33 2017/06/21 18:35:35 adam Exp $
+$NetBSD: distinfo,v 1.34 2017/10/19 08:50:34 adam Exp $
 
-SHA1 (Twisted-17.5.0.tar.bz2) = 51e8b9ea7573f1f1154fb4fb7b04ba84af654647
-RMD160 (Twisted-17.5.0.tar.bz2) = ce39147fb5db15edbc09632492e1d4744ba07bef
-SHA512 (Twisted-17.5.0.tar.bz2) = 0fd10e5db7c87daf0d2225cec9929f1040f0c67e9605bfb1a5bc84db8b825e943cfa08e094c32c25c680bddc6587bfdc525a994ad7b785396e5ddb2621649379
-Size (Twisted-17.5.0.tar.bz2) = 2993816 bytes
+SHA1 (Twisted-17.9.0.tar.bz2) = a218e69ab51b5c6b632043f91aed98bc92083a90
+RMD160 (Twisted-17.9.0.tar.bz2) = 5a4c088b2639eb844f57caaa646a611375078621
+SHA512 (Twisted-17.9.0.tar.bz2) = 0fb854db1044bfdb208594a379a0f8df0193326a9974e193266e82113488d49220648d4a50b323fa144654e94976f5848e1d60efed13ab2668b02cc795720345
+Size (Twisted-17.9.0.tar.bz2) = 3019243 bytes



Home | Main Index | Thread Index | Old Index