18.4.0

Pavel Korovin Thu, 24 May 2018 14:11:42 -0700

Dear all,

Please find the update for devel/py-twisted attached.


Changelog:
https://github.com/twisted/twisted/blob/twisted-18.4.0/NEWS.rst

-- 
With best regards,
Pavel Korovin

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-twisted/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile    6 Apr 2018 19:14:00 -0000       1.7
+++ Makefile    24 May 2018 20:54:33 -0000
@@ -2,7 +2,7 @@
 
 COMMENT =              asynchronous networking Python framework
 
-MODPY_EGG_VERSION =    17.9.0
+MODPY_EGG_VERSION =    18.4.0
 
 EXTRACT_SUFX =         .tar.bz2
 DISTNAME =             Twisted-${MODPY_EGG_VERSION}
@@ -45,7 +45,8 @@ RUN_DEPENDS +=                devel/py-SOAPpy
 .endif
 
 SUBST_FILES =          ${WRKSRC}/src/Twisted.egg-info/entry_points.txt \
-                       ${WRKSRC}/src/twisted/python/_setup.py
+                       ${WRKSRC}/src/twisted/python/_setup.py \
+                       ${WRKSRC}/src/twisted/conch/test/test_ckeygen.py
 
 TEST_DEPENDS =         ${FULLPKGNAME}:${BUILD_PKGPATH}
 TEST_ENV =             LC_ALL=en_US.UTF-8
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-twisted/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo    6 Apr 2018 19:14:00 -0000       1.2
+++ distinfo    24 May 2018 20:54:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (Twisted-17.9.0.tar.bz2) = DaGn411fyuN7yceXiXC1/rO8goIhVbhlTsY5JcBa91w=
-SIZE (Twisted-17.9.0.tar.bz2) = 3019243
+SHA256 (Twisted-18.4.0.tar.bz2) = pMwWSngYWcdN5H8X8OhfS86KMyGp0IksAVyPgMQVitk=
+SIZE (Twisted-18.4.0.tar.bz2) = 3037019
Index: patches/patch-src_twisted_conch_test_test_ckeygen_py
===================================================================
RCS file: patches/patch-src_twisted_conch_test_test_ckeygen_py
diff -N patches/patch-src_twisted_conch_test_test_ckeygen_py
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_twisted_conch_test_test_ckeygen_py        24 May 2018 
20:54:33 -0000
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Index: src/twisted/conch/test/test_ckeygen.py
+--- src/twisted/conch/test/test_ckeygen.py.orig
++++ src/twisted/conch/test/test_ckeygen.py
+@@ -68,9 +68,9 @@ class KeyGenTests(TestCase):
+     def _testrun(self, keyType, keySize=None):
+         filename = self.mktemp()
+         if keySize is None:
+-            subprocess.call(['ckeygen', '-t', keyType, '-f', filename, 
'--no-passphrase'])
++            subprocess.call(['ckeygen${MODPY_BIN_SUFFIX}', '-t', keyType, 
'-f', filename, '--no-passphrase'])
+         else:
+-            subprocess.call(['ckeygen', '-t', keyType, '-f', filename, 
'--no-passphrase',
++            subprocess.call(['ckeygen${MODPY_BIN_SUFFIX}', '-t', keyType, 
'-f', filename, '--no-passphrase',
+                 '-b', keySize])
+         privKey = Key.fromFile(filename)
+         pubKey = Key.fromFile(filename + '.pub')
+@@ -94,7 +94,7 @@ class KeyGenTests(TestCase):
+     def test_runBadKeytype(self):
+         filename = self.mktemp()
+         with self.assertRaises(subprocess.CalledProcessError):
+-            subprocess.check_call(['ckeygen', '-t', 'foo', '-f', filename])
++            subprocess.check_call(['ckeygen${MODPY_BIN_SUFFIX}', '-t', 'foo', 
'-f', filename])
+ 
+ 
+ 
Index: patches/patch-src_twisted_internet_test_test_tcp_py
===================================================================
RCS file: patches/patch-src_twisted_internet_test_test_tcp_py
diff -N patches/patch-src_twisted_internet_test_test_tcp_py
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_twisted_internet_test_test_tcp_py 24 May 2018 20:54:33 
-0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Index: src/twisted/internet/test/test_tcp.py
+--- src/twisted/internet/test/test_tcp.py.orig
++++ src/twisted/internet/test/test_tcp.py
+@@ -2515,7 +2515,11 @@ class SimpleUtilityTests(TestCase):
+         accidentally block if it receives bad input.)
+         """
+         err = self.assertRaises(socket.gaierror, _resolveIPv6, "::1", "http")
+-        self.assertEqual(err.args[0], socket.EAI_NONAME)
++        if sys.platform.startswith(('openbsd')):
++            # https://bugs.python.org/issue1282647
++            self.assertEqual(err.args[0], socket.EAI_SERVICE)
++        else:
++            self.assertEqual(err.args[0], socket.EAI_NONAME)
+ 
+     if platform.isWindows():
+         test_resolveNumericService.skip = ("The AI_NUMERICSERV flag is not "
Index: patches/patch-src_twisted_python__setup_py
===================================================================
RCS file: 
/cvs/ports/devel/py-twisted/patches/patch-src_twisted_python__setup_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_twisted_python__setup_py
--- patches/patch-src_twisted_python__setup_py  6 Apr 2018 19:14:00 -0000       
1.1
+++ patches/patch-src_twisted_python__setup_py  24 May 2018 20:54:33 -0000
@@ -8,13 +8,14 @@ https://github.com/twisted/twisted/commi
 Index: src/twisted/python/_setup.py
 --- src/twisted/python/_setup.py.orig
 +++ src/twisted/python/_setup.py
-@@ -138,14 +138,14 @@ _EXTRAS_REQUIRE = {
+@@ -138,15 +138,15 @@ _EXTRAS_REQUIRE['osx_platform'] = _EXTRAS_REQUIRE['mac
  
  # Scripts provided by Twisted on Python 2 and 3.
  _CONSOLE_SCRIPTS = [
 -    "ckeygen = twisted.conch.scripts.ckeygen:run",
 -    "cftp = twisted.conch.scripts.cftp:run",
 -    "conch = twisted.conch.scripts.conch:run",
+-    "mailmail = twisted.mail.scripts.mailmail:run",
 -    "pyhtmlizer = twisted.scripts.htmlizer:run",
 -    "tkconch = twisted.conch.scripts.tkconch:run",
 -    "trial = twisted.scripts.trial:run",
@@ -23,15 +24,16 @@ Index: src/twisted/python/_setup.py
 +    "ckeygen${MODPY_BIN_SUFFIX} = twisted.conch.scripts.ckeygen:run",
 +    "cftp${MODPY_BIN_SUFFIX} = twisted.conch.scripts.cftp:run",
 +    "conch${MODPY_BIN_SUFFIX} = twisted.conch.scripts.conch:run",
++    "mailmail${MODPY_BIN_SUFFIX} = twisted.mail.scripts.mailmail:run",
 +    "pyhtmlizer${MODPY_BIN_SUFFIX} = twisted.scripts.htmlizer:run",
 +    "tkconch${MODPY_BIN_SUFFIX} = twisted.conch.scripts.tkconch:run",
 +    "trial${MODPY_BIN_SUFFIX} = twisted.scripts.trial:run",
 +    "twist${MODPY_BIN_SUFFIX} = twisted.application.twist._twist:Twist.main",
 +    "twistd${MODPY_BIN_SUFFIX} = twisted.scripts.twistd:run",
      ]
- # Scripts provided by Twisted on Python 2 only.
- _CONSOLE_SCRIPTS_PY2 = [
-@@ -241,6 +241,9 @@ def getSetupArgs(extensions=_EXTENSIONS):
+ 
+ 
+@@ -250,6 +250,9 @@ def getSetupArgs(extensions=_EXTENSIONS):
          },
          cmdclass=command_classes,
          include_package_data=True,
Index: pkg/PFRAG.no-python3
===================================================================
RCS file: /cvs/ports/devel/py-twisted/pkg/PFRAG.no-python3,v
retrieving revision 1.1
diff -u -p -r1.1 PFRAG.no-python3
--- pkg/PFRAG.no-python3        6 Apr 2018 19:14:00 -0000       1.1
+++ pkg/PFRAG.no-python3        24 May 2018 20:54:33 -0000
@@ -1,8 +1,6 @@
 @comment $OpenBSD
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/__init__.py
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/alias.py
-lib/python${MODPY_VERSION}/site-packages/twisted/mail//alias.pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/alias.pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/bounce.py
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/bounce.pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/mail.py
@@ -11,37 +9,18 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/maildir.pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/pb.py
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/pb.pyc
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/pop3.py
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/pop3.pyc
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/pop3client.py
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/pop3client.pyc
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/protocols.py
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/protocols.pyc
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/relay.py
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/relay.pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/relaymanager.py
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/relaymanager.pyc
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/scripts/
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/scripts/__init__.py
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/scripts/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/scripts/mailmail.py
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/scripts/mailmail.pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/tap.py
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/tap.pyc
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/pop3testserver.py
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/pop3testserver.pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/scripts/__init__.py
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/scripts/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_bounce.py
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_bounce.pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_mail.py
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_mail.pyc
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_mailmail.py
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_mailmail.pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_options.py
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_options.pyc
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_pop3.py
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_pop3.pyc
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_pop3client.py
-lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_pop3client.pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_scripts.py
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_scripts.pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/news/
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-twisted/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   6 Apr 2018 19:14:00 -0000       1.2
+++ pkg/PLIST   24 May 2018 20:54:33 -0000
@@ -25,6 +25,7 @@
 bin/cftp${MODPY_BIN_SUFFIX}
 bin/ckeygen${MODPY_BIN_SUFFIX}
 bin/conch${MODPY_BIN_SUFFIX}
+bin/mailmail${MODPY_BIN_SUFFIX}
 bin/pyhtmlizer${MODPY_BIN_SUFFIX}
 bin/tkconch${MODPY_BIN_SUFFIX}
 bin/trial${MODPY_BIN_SUFFIX}
@@ -41,7 +42,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/
 lib/python${MODPY_VERSION}/site-packages/twisted/__init__.py
 lib/python${MODPY_VERSION}/site-packages/twisted/__main__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
@@ -49,7 +50,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/twisted/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/_threads/
 lib/python${MODPY_VERSION}/site-packages/twisted/_threads/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/_threads/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/_threads/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/_threads/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/_threads/${MODPY_PYCACHE}_convenience.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/_threads/${MODPY_PYCACHE}_ithreads.${MODPY_PYC_MAGIC_TAG}pyc
@@ -65,7 +66,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/_threads/_threadworker.py
 lib/python${MODPY_VERSION}/site-packages/twisted/_threads/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/_threads/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/_threads/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/_threads/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/_threads/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/_threads/test/${MODPY_PYCACHE}test_convenience.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/_threads/test/${MODPY_PYCACHE}test_memory.${MODPY_PYC_MAGIC_TAG}pyc
@@ -78,7 +79,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/_version.py
 lib/python${MODPY_VERSION}/site-packages/twisted/application/
 lib/python${MODPY_VERSION}/site-packages/twisted/application/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/application/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/application/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/${MODPY_PYCACHE}app.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/${MODPY_PYCACHE}internet.${MODPY_PYC_MAGIC_TAG}pyc
@@ -90,7 +91,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/application/reactors.py
 lib/python${MODPY_VERSION}/site-packages/twisted/application/runner/
 lib/python${MODPY_VERSION}/site-packages/twisted/application/runner/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/application/runner/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/application/runner/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/runner/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/runner/${MODPY_PYCACHE}_exit.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/runner/${MODPY_PYCACHE}_pidfile.${MODPY_PYC_MAGIC_TAG}pyc
@@ -100,7 +101,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/application/runner/_runner.py
 lib/python${MODPY_VERSION}/site-packages/twisted/application/runner/test/
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/runner/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/application/runner/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/application/runner/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/runner/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/runner/test/${MODPY_PYCACHE}test_exit.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/runner/test/${MODPY_PYCACHE}test_pidfile.${MODPY_PYC_MAGIC_TAG}pyc
@@ -112,7 +113,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/application/strports.py
 lib/python${MODPY_VERSION}/site-packages/twisted/application/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/application/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/application/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/application/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/test/${MODPY_PYCACHE}test_internet.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/test/${MODPY_PYCACHE}test_service.${MODPY_PYC_MAGIC_TAG}pyc
@@ -120,7 +121,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/test/test_service.py
 lib/python${MODPY_VERSION}/site-packages/twisted/application/twist/
 lib/python${MODPY_VERSION}/site-packages/twisted/application/twist/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/application/twist/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/application/twist/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/twist/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/twist/${MODPY_PYCACHE}_options.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/twist/${MODPY_PYCACHE}_twist.${MODPY_PYC_MAGIC_TAG}pyc
@@ -128,7 +129,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/application/twist/_twist.py
 lib/python${MODPY_VERSION}/site-packages/twisted/application/twist/test/
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/twist/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/application/twist/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/application/twist/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/twist/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/twist/test/${MODPY_PYCACHE}test_options.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/twist/test/${MODPY_PYCACHE}test_twist.${MODPY_PYC_MAGIC_TAG}pyc
@@ -136,7 +137,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/twisted/application/twist/test/test_twist.py
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/conch/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/conch/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/${MODPY_PYCACHE}avatar.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/${MODPY_PYCACHE}checkers.${MODPY_PYC_MAGIC_TAG}pyc
@@ -158,7 +159,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/checkers.py
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/client/
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/client/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/conch/client/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/conch/client/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/client/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/client/${MODPY_PYCACHE}agent.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/client/${MODPY_PYCACHE}connect.${MODPY_PYC_MAGIC_TAG}pyc
@@ -176,7 +177,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/error.py
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/insults/
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/insults/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/conch/insults/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/conch/insults/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/insults/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/insults/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/insults/${MODPY_PYCACHE}colors.${MODPY_PYC_MAGIC_TAG}pyc
@@ -198,7 +199,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/mixin.py
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/openssh_compat/
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/openssh_compat/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/conch/openssh_compat/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/conch/openssh_compat/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/openssh_compat/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/openssh_compat/${MODPY_PYCACHE}factory.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/openssh_compat/${MODPY_PYCACHE}primes.${MODPY_PYC_MAGIC_TAG}pyc
@@ -207,7 +208,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/recvline.py
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/scripts/
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/scripts/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/conch/scripts/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/conch/scripts/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/scripts/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/scripts/${MODPY_PYCACHE}cftp.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/scripts/${MODPY_PYCACHE}ckeygen.${MODPY_PYC_MAGIC_TAG}pyc
@@ -219,7 +220,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/scripts/tkconch.py
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/${MODPY_PYCACHE}_kex.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/ssh/${MODPY_PYCACHE}address.${MODPY_PYC_MAGIC_TAG}pyc
@@ -256,7 +257,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/telnet.py
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/conch/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/conch/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/test/${MODPY_PYCACHE}keydata.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/test/${MODPY_PYCACHE}loopback.${MODPY_PYC_MAGIC_TAG}pyc
@@ -327,7 +328,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/ttymodes.py
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/ui/
 lib/python${MODPY_VERSION}/site-packages/twisted/conch/ui/__init__.py
-${MODPY_COMMENT}${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/conch/ui/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/conch/ui/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/ui/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/ui/${MODPY_PYCACHE}ansi.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/conch/ui/${MODPY_PYCACHE}tkvt100.${MODPY_PYC_MAGIC_TAG}pyc
@@ -337,7 +338,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/copyright.py
 lib/python${MODPY_VERSION}/site-packages/twisted/cred/
 lib/python${MODPY_VERSION}/site-packages/twisted/cred/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/cred/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/cred/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/cred/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/cred/${MODPY_PYCACHE}_digest.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/cred/${MODPY_PYCACHE}checkers.${MODPY_PYC_MAGIC_TAG}pyc
@@ -353,7 +354,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/cred/strcred.py
 lib/python${MODPY_VERSION}/site-packages/twisted/cred/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/cred/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/cred/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/cred/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/cred/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/cred/test/${MODPY_PYCACHE}test_cramauth.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/cred/test/${MODPY_PYCACHE}test_cred.${MODPY_PYC_MAGIC_TAG}pyc
@@ -367,13 +368,13 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/cred/test/test_strcred.py
 lib/python${MODPY_VERSION}/site-packages/twisted/enterprise/
 lib/python${MODPY_VERSION}/site-packages/twisted/enterprise/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/enterprise/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/enterprise/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/enterprise/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/enterprise/${MODPY_PYCACHE}adbapi.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/enterprise/adbapi.py
 lib/python${MODPY_VERSION}/site-packages/twisted/internet/
 lib/python${MODPY_VERSION}/site-packages/twisted/internet/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/internet/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/internet/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/internet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/internet/${MODPY_PYCACHE}_baseprocess.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/internet/${MODPY_PYCACHE}_dumbwin32proc.${MODPY_PYC_MAGIC_TAG}pyc
@@ -463,7 +464,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/internet/interfaces.py
 lib/python${MODPY_VERSION}/site-packages/twisted/internet/iocpreactor/
 
lib/python${MODPY_VERSION}/site-packages/twisted/internet/iocpreactor/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/internet/iocpreactor/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/internet/iocpreactor/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/internet/iocpreactor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/internet/iocpreactor/${MODPY_PYCACHE}abstract.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/internet/iocpreactor/${MODPY_PYCACHE}const.${MODPY_PYC_MAGIC_TAG}pyc
@@ -496,7 +497,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/internet/tcp.py
 lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/${MODPY_PYCACHE}_posixifaces.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/${MODPY_PYCACHE}_win32ifaces.${MODPY_PYC_MAGIC_TAG}pyc
@@ -510,6 +511,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/${MODPY_PYCACHE}reactormixins.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/${MODPY_PYCACHE}test_abstract.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/${MODPY_PYCACHE}test_address.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/${MODPY_PYCACHE}test_asyncioreactor.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/${MODPY_PYCACHE}test_base.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/${MODPY_PYCACHE}test_baseprocess.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/${MODPY_PYCACHE}test_core.${MODPY_PYC_MAGIC_TAG}pyc
@@ -566,6 +568,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/reactormixins.py
 lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/test_abstract.py
 lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/test_address.py
+lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/test_asyncioreactor.py
 lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/test_base.py
 
lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/test_baseprocess.py
 lib/python${MODPY_VERSION}/site-packages/twisted/internet/test/test_core.py
@@ -612,7 +615,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/internet/wxsupport.py
 lib/python${MODPY_VERSION}/site-packages/twisted/logger/
 lib/python${MODPY_VERSION}/site-packages/twisted/logger/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/logger/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/logger/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/logger/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/logger/${MODPY_PYCACHE}_buffer.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/logger/${MODPY_PYCACHE}_file.${MODPY_PYC_MAGIC_TAG}pyc
@@ -644,7 +647,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/logger/_util.py
 lib/python${MODPY_VERSION}/site-packages/twisted/logger/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/logger/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/logger/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/logger/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/logger/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/logger/test/${MODPY_PYCACHE}test_buffer.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/logger/test/${MODPY_PYCACHE}test_file.${MODPY_PYC_MAGIC_TAG}pyc
@@ -675,29 +678,51 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/logger/test/test_stdlib.py
 lib/python${MODPY_VERSION}/site-packages/twisted/logger/test/test_util.py
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/mail/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/mail/${MODPY_PYCACHE}
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/mail/${MODPY_PYCACHE}_cred.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/mail/${MODPY_PYCACHE}_except.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/mail/${MODPY_PYCACHE}imap4.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/mail/${MODPY_PYCACHE}interfaces.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/${MODPY_PYCACHE}pop3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/${MODPY_PYCACHE}pop3client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/${MODPY_PYCACHE}protocols.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/${MODPY_PYCACHE}relay.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/mail/${MODPY_PYCACHE}smtp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/_cred.py
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/_except.py
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/imap4.py
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/interfaces.py
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/pop3.py
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/pop3client.py
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/protocols.py
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/relay.py
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/scripts/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/mail/scripts/${MODPY_PYCACHE}
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/scripts/${MODPY_PYCACHE}mailmail.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/scripts/mailmail.py
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/smtp.py
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/${MODPY_PYCACHE}pop3testserver.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/${MODPY_PYCACHE}test_imap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/${MODPY_PYCACHE}test_mailmail.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/${MODPY_PYCACHE}test_pop3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/${MODPY_PYCACHE}test_pop3client.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/${MODPY_PYCACHE}test_smtp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/pop3testserver.py
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/rfc822.message
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_imap.py
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_mailmail.py
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_pop3.py
+lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_pop3client.py
 lib/python${MODPY_VERSION}/site-packages/twisted/mail/test/test_smtp.py
 lib/python${MODPY_VERSION}/site-packages/twisted/names/
 lib/python${MODPY_VERSION}/site-packages/twisted/names/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/names/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/names/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/names/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/names/${MODPY_PYCACHE}_rfc1982.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/names/${MODPY_PYCACHE}authority.${MODPY_PYC_MAGIC_TAG}pyc
@@ -729,7 +754,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/names/tap.py
 lib/python${MODPY_VERSION}/site-packages/twisted/names/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/names/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/names/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/names/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/names/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/names/test/${MODPY_PYCACHE}test_cache.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/names/test/${MODPY_PYCACHE}test_client.${MODPY_PYC_MAGIC_TAG}pyc
@@ -761,7 +786,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/names/test/test_util.py
 lib/python${MODPY_VERSION}/site-packages/twisted/pair/
 lib/python${MODPY_VERSION}/site-packages/twisted/pair/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/pair/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/pair/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/pair/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/pair/${MODPY_PYCACHE}ethernet.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/pair/${MODPY_PYCACHE}ip.${MODPY_PYC_MAGIC_TAG}pyc
@@ -775,7 +800,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/pair/rawudp.py
 lib/python${MODPY_VERSION}/site-packages/twisted/pair/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/pair/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/pair/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/pair/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/pair/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/pair/test/${MODPY_PYCACHE}test_ethernet.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/pair/test/${MODPY_PYCACHE}test_ip.${MODPY_PYC_MAGIC_TAG}pyc
@@ -789,7 +814,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/pair/tuntap.py
 lib/python${MODPY_VERSION}/site-packages/twisted/persisted/
 lib/python${MODPY_VERSION}/site-packages/twisted/persisted/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/persisted/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/persisted/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/persisted/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/persisted/${MODPY_PYCACHE}aot.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/persisted/${MODPY_PYCACHE}crefutil.${MODPY_PYC_MAGIC_TAG}pyc
@@ -803,14 +828,14 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/persisted/styles.py
 lib/python${MODPY_VERSION}/site-packages/twisted/persisted/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/persisted/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/persisted/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/persisted/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/persisted/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/persisted/test/${MODPY_PYCACHE}test_styles.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/persisted/test/test_styles.py
 lib/python${MODPY_VERSION}/site-packages/twisted/plugin.py
 lib/python${MODPY_VERSION}/site-packages/twisted/plugins/
 lib/python${MODPY_VERSION}/site-packages/twisted/plugins/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/plugins/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/plugins/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/plugins/${MODPY_PYCACHE}cred_anonymous.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/plugins/${MODPY_PYCACHE}cred_file.${MODPY_PYC_MAGIC_TAG}pyc
@@ -848,7 +873,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/plugins/twisted_words.py
 lib/python${MODPY_VERSION}/site-packages/twisted/positioning/
 lib/python${MODPY_VERSION}/site-packages/twisted/positioning/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/positioning/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/positioning/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/positioning/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/positioning/${MODPY_PYCACHE}_sentence.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/positioning/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
@@ -860,7 +885,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/positioning/nmea.py
 lib/python${MODPY_VERSION}/site-packages/twisted/positioning/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/positioning/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/positioning/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/positioning/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/positioning/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/positioning/test/${MODPY_PYCACHE}receiver.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/positioning/test/${MODPY_PYCACHE}test_base.${MODPY_PYC_MAGIC_TAG}pyc
@@ -872,7 +897,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/twisted/positioning/test/test_sentence.py
 lib/python${MODPY_VERSION}/site-packages/twisted/protocols/
 lib/python${MODPY_VERSION}/site-packages/twisted/protocols/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/protocols/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/protocols/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/${MODPY_PYCACHE}amp.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/${MODPY_PYCACHE}basic.${MODPY_PYC_MAGIC_TAG}pyc
@@ -899,7 +924,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/protocols/ftp.py
 lib/python${MODPY_VERSION}/site-packages/twisted/protocols/haproxy/
 lib/python${MODPY_VERSION}/site-packages/twisted/protocols/haproxy/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/protocols/haproxy/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/protocols/haproxy/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/haproxy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/haproxy/${MODPY_PYCACHE}_exceptions.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/haproxy/${MODPY_PYCACHE}_info.${MODPY_PYC_MAGIC_TAG}pyc
@@ -917,7 +942,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/protocols/haproxy/_wrapper.py
 lib/python${MODPY_VERSION}/site-packages/twisted/protocols/haproxy/test/
 
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/haproxy/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/protocols/haproxy/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/protocols/haproxy/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/haproxy/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/haproxy/test/${MODPY_PYCACHE}test_parser.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/haproxy/test/${MODPY_PYCACHE}test_v1parser.${MODPY_PYC_MAGIC_TAG}pyc
@@ -940,7 +965,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/protocols/stateful.py
 lib/python${MODPY_VERSION}/site-packages/twisted/protocols/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/protocols/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/protocols/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/protocols/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/test/${MODPY_PYCACHE}test_basic.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/protocols/test/${MODPY_PYCACHE}test_tls.${MODPY_PYC_MAGIC_TAG}pyc
@@ -950,7 +975,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/protocols/wire.py
 lib/python${MODPY_VERSION}/site-packages/twisted/python/
 lib/python${MODPY_VERSION}/site-packages/twisted/python/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/python/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/python/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/python/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/python/${MODPY_PYCACHE}_appdirs.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/python/${MODPY_PYCACHE}_inotify.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1039,7 +1064,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/python/systemd.py
 lib/python${MODPY_VERSION}/site-packages/twisted/python/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/python/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/python/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/python/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/python/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/python/test/${MODPY_PYCACHE}deprecatedattributes.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/python/test/${MODPY_PYCACHE}modules_helpers.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1108,7 +1133,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/python/zipstream.py
 lib/python${MODPY_VERSION}/site-packages/twisted/runner/
 lib/python${MODPY_VERSION}/site-packages/twisted/runner/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/runner/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/runner/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/runner/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/runner/${MODPY_PYCACHE}inetd.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/runner/${MODPY_PYCACHE}inetdconf.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1122,7 +1147,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/runner/procmontap.py
 lib/python${MODPY_VERSION}/site-packages/twisted/runner/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/runner/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/runner/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/runner/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/runner/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/runner/test/${MODPY_PYCACHE}test_inetdconf.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/runner/test/${MODPY_PYCACHE}test_procmon.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1132,7 +1157,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/runner/test/test_procmontap.py
 lib/python${MODPY_VERSION}/site-packages/twisted/scripts/
 lib/python${MODPY_VERSION}/site-packages/twisted/scripts/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/scripts/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/scripts/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/scripts/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/scripts/${MODPY_PYCACHE}_twistd_unix.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/scripts/${MODPY_PYCACHE}_twistw.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1144,7 +1169,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/scripts/htmlizer.py
 lib/python${MODPY_VERSION}/site-packages/twisted/scripts/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/scripts/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/scripts/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/scripts/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/scripts/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/scripts/test/${MODPY_PYCACHE}test_scripts.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/scripts/test/test_scripts.py
@@ -1152,7 +1177,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/scripts/twistd.py
 lib/python${MODPY_VERSION}/site-packages/twisted/spread/
 lib/python${MODPY_VERSION}/site-packages/twisted/spread/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/spread/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/spread/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/spread/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/spread/${MODPY_PYCACHE}banana.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/spread/${MODPY_PYCACHE}flavors.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1169,7 +1194,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/spread/publish.py
 lib/python${MODPY_VERSION}/site-packages/twisted/spread/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/spread/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/spread/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/spread/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/spread/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/spread/test/${MODPY_PYCACHE}test_banana.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/spread/test/${MODPY_PYCACHE}test_jelly.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1182,7 +1207,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/spread/util.py
 lib/python${MODPY_VERSION}/site-packages/twisted/tap/
 lib/python${MODPY_VERSION}/site-packages/twisted/tap/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/tap/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/tap/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/tap/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/tap/${MODPY_PYCACHE}ftp.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/tap/${MODPY_PYCACHE}portforward.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1192,7 +1217,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/tap/socks.py
 lib/python${MODPY_VERSION}/site-packages/twisted/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/test/${MODPY_PYCACHE}crash_test_dummy.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/test/${MODPY_PYCACHE}iosim.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1407,7 +1432,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/trial/
 lib/python${MODPY_VERSION}/site-packages/twisted/trial/__init__.py
 lib/python${MODPY_VERSION}/site-packages/twisted/trial/__main__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/trial/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/trial/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/trial/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/trial/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/trial/${MODPY_PYCACHE}_asyncrunner.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1422,7 +1447,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/trial/_asynctest.py
 lib/python${MODPY_VERSION}/site-packages/twisted/trial/_dist/
 lib/python${MODPY_VERSION}/site-packages/twisted/trial/_dist/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/trial/_dist/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/trial/_dist/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/trial/_dist/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/trial/_dist/${MODPY_PYCACHE}distreporter.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/trial/_dist/${MODPY_PYCACHE}disttrial.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1438,7 +1463,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/trial/_dist/options.py
 lib/python${MODPY_VERSION}/site-packages/twisted/trial/_dist/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/trial/_dist/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/trial/_dist/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/trial/_dist/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/trial/_dist/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/trial/_dist/test/${MODPY_PYCACHE}test_distreporter.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/trial/_dist/test/${MODPY_PYCACHE}test_disttrial.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1462,7 +1487,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/trial/runner.py
 lib/python${MODPY_VERSION}/site-packages/twisted/trial/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/trial/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/trial/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/trial/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/trial/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/trial/test/${MODPY_PYCACHE}detests.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/trial/test/${MODPY_PYCACHE}erroneous.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1536,7 +1561,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/trial/util.py
 lib/python${MODPY_VERSION}/site-packages/twisted/web/
 lib/python${MODPY_VERSION}/site-packages/twisted/web/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/web/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/web/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/web/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/web/${MODPY_PYCACHE}_element.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/web/${MODPY_PYCACHE}_flatten.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1571,7 +1596,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/twisted/web/${MODPY_PYCACHE}xmlrpc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/web/_auth/
 lib/python${MODPY_VERSION}/site-packages/twisted/web/_auth/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/web/_auth/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/web/_auth/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/web/_auth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/web/_auth/${MODPY_PYCACHE}basic.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/web/_auth/${MODPY_PYCACHE}digest.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1607,7 +1632,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/web/template.py
 lib/python${MODPY_VERSION}/site-packages/twisted/web/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/web/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/web/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/web/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/web/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/web/test/${MODPY_PYCACHE}_util.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/web/test/${MODPY_PYCACHE}requesthelper.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1676,7 +1701,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/web/xmlrpc.py
 lib/python${MODPY_VERSION}/site-packages/twisted/words/
 lib/python${MODPY_VERSION}/site-packages/twisted/words/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/words/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/words/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/words/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/words/${MODPY_PYCACHE}ewords.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/words/${MODPY_PYCACHE}iwords.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1686,7 +1711,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/words/ewords.py
 lib/python${MODPY_VERSION}/site-packages/twisted/words/im/
 lib/python${MODPY_VERSION}/site-packages/twisted/words/im/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/words/im/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/words/im/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/words/im/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/words/im/${MODPY_PYCACHE}baseaccount.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/words/im/${MODPY_PYCACHE}basechat.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1706,13 +1731,13 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/words/iwords.py
 lib/python${MODPY_VERSION}/site-packages/twisted/words/protocols/
 lib/python${MODPY_VERSION}/site-packages/twisted/words/protocols/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/words/protocols/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/words/protocols/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/words/protocols/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/words/protocols/${MODPY_PYCACHE}irc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/twisted/words/protocols/irc.py
 lib/python${MODPY_VERSION}/site-packages/twisted/words/protocols/jabber/
 
lib/python${MODPY_VERSION}/site-packages/twisted/words/protocols/jabber/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/words/protocols/jabber/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/words/protocols/jabber/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/words/protocols/jabber/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/words/protocols/jabber/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/words/protocols/jabber/${MODPY_PYCACHE}component.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1738,7 +1763,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/words/tap.py
 lib/python${MODPY_VERSION}/site-packages/twisted/words/test/
 lib/python${MODPY_VERSION}/site-packages/twisted/words/test/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/words/test/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/words/test/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/words/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/words/test/${MODPY_PYCACHE}test_basechat.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/words/test/${MODPY_PYCACHE}test_basesupport.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1784,7 +1809,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/twisted/words/test/test_xpath.py
 lib/python${MODPY_VERSION}/site-packages/twisted/words/xish/
 lib/python${MODPY_VERSION}/site-packages/twisted/words/xish/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/words/xish/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/words/xish/${MODPY_PYCACHE}
 
lib/python${MODPY_VERSION}/site-packages/twisted/words/xish/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/words/xish/${MODPY_PYCACHE}domish.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/twisted/words/xish/${MODPY_PYCACHE}utility.${MODPY_PYC_MAGIC_TAG}pyc

UPDATE: devel/py-twisted 17.9.0 -> 18.4.0

Reply via email to