Re: CVS commit: pkgsrc/devel/py-future

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Leonardo Taccari writes:
> [...]
> Adam Ciarcinski writes:
> > [...]
> > Log Message:
> > py-future: updated to 0.18.2
> > [...]
>
> When building with python37 on NetBSD/amd64 -current it fails with
> several PLIST mismateches, can you please look at it?

Attached here possible patch that fixes the build with python27 and
python37.

Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/py-future/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- PLIST       14 Dec 2019 10:58:37 -0000      1.4
+++ PLIST       15 Dec 2019 10:56:53 -0000
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2019/12/14 10:58:37 adam Exp $
+@comment $NetBSD$
 bin/futurize-${PYVERSSUFFIX}
 bin/pasteurize-${PYVERSSUFFIX}
-${PLIST.py2x}${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PLIST.py2x}${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PLIST.py2x}${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PLIST.py2x}${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PLIST.py2x}${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PLIST.py2x}${PYSITELIB}/_dummy_thread/__init__.py
 ${PLIST.py2x}${PYSITELIB}/_dummy_thread/__init__.pyc
 ${PLIST.py2x}${PYSITELIB}/_dummy_thread/__init__.pyo
@@ -27,363 +27,363 @@ ${PYSITELIB}/future/__init__.pyo
 ${PYSITELIB}/future/backports/__init__.py
 ${PYSITELIB}/future/backports/__init__.pyc
 ${PYSITELIB}/future/backports/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/_markupbase.py
+${PYSITELIB}/future/backports/_markupbase.py
 ${PYSITELIB}/future/backports/_markupbase.pyc
 ${PYSITELIB}/future/backports/_markupbase.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/datetime.py
+${PYSITELIB}/future/backports/datetime.py
 ${PYSITELIB}/future/backports/datetime.pyc
 ${PYSITELIB}/future/backports/datetime.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/__init__.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/_encoded_words.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/_encoded_words.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/_encoded_words.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/_header_value_parser.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/_header_value_parser.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/_header_value_parser.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/_parseaddr.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/_parseaddr.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/_parseaddr.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/_policybase.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/_policybase.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/_policybase.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/base64mime.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/base64mime.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/base64mime.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/charset.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/charset.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/charset.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/encoders.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/encoders.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/encoders.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/errors.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/errors.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/errors.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/feedparser.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/feedparser.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/feedparser.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/generator.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/generator.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/generator.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/header.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/header.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/header.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/headerregistry.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/headerregistry.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/headerregistry.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/iterators.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/iterators.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/iterators.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/message.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/message.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/message.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/__init__.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/application.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/application.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/application.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/audio.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/audio.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/audio.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/base.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/base.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/base.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/image.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/image.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/image.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/message.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/message.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/message.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/multipart.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/multipart.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/multipart.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/nonmultipart.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/nonmultipart.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/nonmultipart.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/text.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/text.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/mime/text.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/parser.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/parser.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/parser.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/policy.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/policy.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/policy.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/quoprimime.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/quoprimime.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/quoprimime.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/email/utils.py
-${PLIST.py2x}${PYSITELIB}/future/backports/email/utils.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/email/utils.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/html/__init__.py
-${PLIST.py2x}${PYSITELIB}/future/backports/html/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/html/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/html/entities.py
-${PLIST.py2x}${PYSITELIB}/future/backports/html/entities.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/html/entities.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/html/parser.py
-${PLIST.py2x}${PYSITELIB}/future/backports/html/parser.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/html/parser.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/http/__init__.py
-${PLIST.py2x}${PYSITELIB}/future/backports/http/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/http/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/http/client.py
-${PLIST.py2x}${PYSITELIB}/future/backports/http/client.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/http/client.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/http/cookiejar.py
-${PLIST.py2x}${PYSITELIB}/future/backports/http/cookiejar.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/http/cookiejar.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/http/cookies.py
-${PLIST.py2x}${PYSITELIB}/future/backports/http/cookies.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/http/cookies.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/http/server.py
-${PLIST.py2x}${PYSITELIB}/future/backports/http/server.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/http/server.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/misc.py
+${PYSITELIB}/future/backports/email/__init__.py
+${PYSITELIB}/future/backports/email/__init__.pyc
+${PYSITELIB}/future/backports/email/__init__.pyo
+${PYSITELIB}/future/backports/email/_encoded_words.py
+${PYSITELIB}/future/backports/email/_encoded_words.pyc
+${PYSITELIB}/future/backports/email/_encoded_words.pyo
+${PYSITELIB}/future/backports/email/_header_value_parser.py
+${PYSITELIB}/future/backports/email/_header_value_parser.pyc
+${PYSITELIB}/future/backports/email/_header_value_parser.pyo
+${PYSITELIB}/future/backports/email/_parseaddr.py
+${PYSITELIB}/future/backports/email/_parseaddr.pyc
+${PYSITELIB}/future/backports/email/_parseaddr.pyo
+${PYSITELIB}/future/backports/email/_policybase.py
+${PYSITELIB}/future/backports/email/_policybase.pyc
+${PYSITELIB}/future/backports/email/_policybase.pyo
+${PYSITELIB}/future/backports/email/base64mime.py
+${PYSITELIB}/future/backports/email/base64mime.pyc
+${PYSITELIB}/future/backports/email/base64mime.pyo
+${PYSITELIB}/future/backports/email/charset.py
+${PYSITELIB}/future/backports/email/charset.pyc
+${PYSITELIB}/future/backports/email/charset.pyo
+${PYSITELIB}/future/backports/email/encoders.py
+${PYSITELIB}/future/backports/email/encoders.pyc
+${PYSITELIB}/future/backports/email/encoders.pyo
+${PYSITELIB}/future/backports/email/errors.py
+${PYSITELIB}/future/backports/email/errors.pyc
+${PYSITELIB}/future/backports/email/errors.pyo
+${PYSITELIB}/future/backports/email/feedparser.py
+${PYSITELIB}/future/backports/email/feedparser.pyc
+${PYSITELIB}/future/backports/email/feedparser.pyo
+${PYSITELIB}/future/backports/email/generator.py
+${PYSITELIB}/future/backports/email/generator.pyc
+${PYSITELIB}/future/backports/email/generator.pyo
+${PYSITELIB}/future/backports/email/header.py
+${PYSITELIB}/future/backports/email/header.pyc
+${PYSITELIB}/future/backports/email/header.pyo
+${PYSITELIB}/future/backports/email/headerregistry.py
+${PYSITELIB}/future/backports/email/headerregistry.pyc
+${PYSITELIB}/future/backports/email/headerregistry.pyo
+${PYSITELIB}/future/backports/email/iterators.py
+${PYSITELIB}/future/backports/email/iterators.pyc
+${PYSITELIB}/future/backports/email/iterators.pyo
+${PYSITELIB}/future/backports/email/message.py
+${PYSITELIB}/future/backports/email/message.pyc
+${PYSITELIB}/future/backports/email/message.pyo
+${PYSITELIB}/future/backports/email/mime/__init__.py
+${PYSITELIB}/future/backports/email/mime/__init__.pyc
+${PYSITELIB}/future/backports/email/mime/__init__.pyo
+${PYSITELIB}/future/backports/email/mime/application.py
+${PYSITELIB}/future/backports/email/mime/application.pyc
+${PYSITELIB}/future/backports/email/mime/application.pyo
+${PYSITELIB}/future/backports/email/mime/audio.py
+${PYSITELIB}/future/backports/email/mime/audio.pyc
+${PYSITELIB}/future/backports/email/mime/audio.pyo
+${PYSITELIB}/future/backports/email/mime/base.py
+${PYSITELIB}/future/backports/email/mime/base.pyc
+${PYSITELIB}/future/backports/email/mime/base.pyo
+${PYSITELIB}/future/backports/email/mime/image.py
+${PYSITELIB}/future/backports/email/mime/image.pyc
+${PYSITELIB}/future/backports/email/mime/image.pyo
+${PYSITELIB}/future/backports/email/mime/message.py
+${PYSITELIB}/future/backports/email/mime/message.pyc
+${PYSITELIB}/future/backports/email/mime/message.pyo
+${PYSITELIB}/future/backports/email/mime/multipart.py
+${PYSITELIB}/future/backports/email/mime/multipart.pyc
+${PYSITELIB}/future/backports/email/mime/multipart.pyo
+${PYSITELIB}/future/backports/email/mime/nonmultipart.py
+${PYSITELIB}/future/backports/email/mime/nonmultipart.pyc
+${PYSITELIB}/future/backports/email/mime/nonmultipart.pyo
+${PYSITELIB}/future/backports/email/mime/text.py
+${PYSITELIB}/future/backports/email/mime/text.pyc
+${PYSITELIB}/future/backports/email/mime/text.pyo
+${PYSITELIB}/future/backports/email/parser.py
+${PYSITELIB}/future/backports/email/parser.pyc
+${PYSITELIB}/future/backports/email/parser.pyo
+${PYSITELIB}/future/backports/email/policy.py
+${PYSITELIB}/future/backports/email/policy.pyc
+${PYSITELIB}/future/backports/email/policy.pyo
+${PYSITELIB}/future/backports/email/quoprimime.py
+${PYSITELIB}/future/backports/email/quoprimime.pyc
+${PYSITELIB}/future/backports/email/quoprimime.pyo
+${PYSITELIB}/future/backports/email/utils.py
+${PYSITELIB}/future/backports/email/utils.pyc
+${PYSITELIB}/future/backports/email/utils.pyo
+${PYSITELIB}/future/backports/html/__init__.py
+${PYSITELIB}/future/backports/html/__init__.pyc
+${PYSITELIB}/future/backports/html/__init__.pyo
+${PYSITELIB}/future/backports/html/entities.py
+${PYSITELIB}/future/backports/html/entities.pyc
+${PYSITELIB}/future/backports/html/entities.pyo
+${PYSITELIB}/future/backports/html/parser.py
+${PYSITELIB}/future/backports/html/parser.pyc
+${PYSITELIB}/future/backports/html/parser.pyo
+${PYSITELIB}/future/backports/http/__init__.py
+${PYSITELIB}/future/backports/http/__init__.pyc
+${PYSITELIB}/future/backports/http/__init__.pyo
+${PYSITELIB}/future/backports/http/client.py
+${PYSITELIB}/future/backports/http/client.pyc
+${PYSITELIB}/future/backports/http/client.pyo
+${PYSITELIB}/future/backports/http/cookiejar.py
+${PYSITELIB}/future/backports/http/cookiejar.pyc
+${PYSITELIB}/future/backports/http/cookiejar.pyo
+${PYSITELIB}/future/backports/http/cookies.py
+${PYSITELIB}/future/backports/http/cookies.pyc
+${PYSITELIB}/future/backports/http/cookies.pyo
+${PYSITELIB}/future/backports/http/server.py
+${PYSITELIB}/future/backports/http/server.pyc
+${PYSITELIB}/future/backports/http/server.pyo
+${PYSITELIB}/future/backports/misc.py
 ${PYSITELIB}/future/backports/misc.pyc
 ${PYSITELIB}/future/backports/misc.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/socket.py
+${PYSITELIB}/future/backports/socket.py
 ${PYSITELIB}/future/backports/socket.pyc
 ${PYSITELIB}/future/backports/socket.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/socketserver.py
+${PYSITELIB}/future/backports/socketserver.py
 ${PYSITELIB}/future/backports/socketserver.pyc
 ${PYSITELIB}/future/backports/socketserver.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/test/__init__.py
-${PLIST.py2x}${PYSITELIB}/future/backports/test/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/test/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/test/badcert.pem
-${PLIST.py2x}${PYSITELIB}/future/backports/test/badkey.pem
-${PLIST.py2x}${PYSITELIB}/future/backports/test/dh512.pem
-${PLIST.py2x}${PYSITELIB}/future/backports/test/https_svn_python_org_root.pem
-${PLIST.py2x}${PYSITELIB}/future/backports/test/keycert.passwd.pem
-${PLIST.py2x}${PYSITELIB}/future/backports/test/keycert.pem
-${PLIST.py2x}${PYSITELIB}/future/backports/test/keycert2.pem
-${PLIST.py2x}${PYSITELIB}/future/backports/test/nokia.pem
-${PLIST.py2x}${PYSITELIB}/future/backports/test/nullbytecert.pem
-${PLIST.py2x}${PYSITELIB}/future/backports/test/nullcert.pem
-${PLIST.py2x}${PYSITELIB}/future/backports/test/pystone.py
-${PLIST.py2x}${PYSITELIB}/future/backports/test/pystone.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/test/pystone.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/test/sha256.pem
-${PLIST.py2x}${PYSITELIB}/future/backports/test/ssl_cert.pem
-${PLIST.py2x}${PYSITELIB}/future/backports/test/ssl_key.passwd.pem
-${PLIST.py2x}${PYSITELIB}/future/backports/test/ssl_key.pem
-${PLIST.py2x}${PYSITELIB}/future/backports/test/ssl_servers.py
-${PLIST.py2x}${PYSITELIB}/future/backports/test/ssl_servers.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/test/ssl_servers.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/test/support.py
-${PLIST.py2x}${PYSITELIB}/future/backports/test/support.pyc
-${PLIST.py2x}${PYSITELIB}/future/backports/test/support.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/total_ordering.py
+${PYSITELIB}/future/backports/test/__init__.py
+${PYSITELIB}/future/backports/test/__init__.pyc
+${PYSITELIB}/future/backports/test/__init__.pyo
+${PYSITELIB}/future/backports/test/badcert.pem
+${PYSITELIB}/future/backports/test/badkey.pem
+${PYSITELIB}/future/backports/test/dh512.pem
+${PYSITELIB}/future/backports/test/https_svn_python_org_root.pem
+${PYSITELIB}/future/backports/test/keycert.passwd.pem
+${PYSITELIB}/future/backports/test/keycert.pem
+${PYSITELIB}/future/backports/test/keycert2.pem
+${PYSITELIB}/future/backports/test/nokia.pem
+${PYSITELIB}/future/backports/test/nullbytecert.pem
+${PYSITELIB}/future/backports/test/nullcert.pem
+${PYSITELIB}/future/backports/test/pystone.py
+${PYSITELIB}/future/backports/test/pystone.pyc
+${PYSITELIB}/future/backports/test/pystone.pyo
+${PYSITELIB}/future/backports/test/sha256.pem
+${PYSITELIB}/future/backports/test/ssl_cert.pem
+${PYSITELIB}/future/backports/test/ssl_key.passwd.pem
+${PYSITELIB}/future/backports/test/ssl_key.pem
+${PYSITELIB}/future/backports/test/ssl_servers.py
+${PYSITELIB}/future/backports/test/ssl_servers.pyc
+${PYSITELIB}/future/backports/test/ssl_servers.pyo
+${PYSITELIB}/future/backports/test/support.py
+${PYSITELIB}/future/backports/test/support.pyc
+${PYSITELIB}/future/backports/test/support.pyo
+${PYSITELIB}/future/backports/total_ordering.py
 ${PYSITELIB}/future/backports/total_ordering.pyc
 ${PYSITELIB}/future/backports/total_ordering.pyo
 ${PYSITELIB}/future/backports/urllib/__init__.py
 ${PYSITELIB}/future/backports/urllib/__init__.pyc
 ${PYSITELIB}/future/backports/urllib/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/urllib/error.py
+${PYSITELIB}/future/backports/urllib/error.py
 ${PYSITELIB}/future/backports/urllib/error.pyc
 ${PYSITELIB}/future/backports/urllib/error.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/urllib/parse.py
+${PYSITELIB}/future/backports/urllib/parse.py
 ${PYSITELIB}/future/backports/urllib/parse.pyc
 ${PYSITELIB}/future/backports/urllib/parse.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/urllib/request.py
+${PYSITELIB}/future/backports/urllib/request.py
 ${PYSITELIB}/future/backports/urllib/request.pyc
 ${PYSITELIB}/future/backports/urllib/request.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/urllib/response.py
+${PYSITELIB}/future/backports/urllib/response.py
 ${PYSITELIB}/future/backports/urllib/response.pyc
 ${PYSITELIB}/future/backports/urllib/response.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/urllib/robotparser.py
+${PYSITELIB}/future/backports/urllib/robotparser.py
 ${PYSITELIB}/future/backports/urllib/robotparser.pyc
 ${PYSITELIB}/future/backports/urllib/robotparser.pyo
 ${PYSITELIB}/future/backports/xmlrpc/__init__.py
 ${PYSITELIB}/future/backports/xmlrpc/__init__.pyc
 ${PYSITELIB}/future/backports/xmlrpc/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/xmlrpc/client.py
+${PYSITELIB}/future/backports/xmlrpc/client.py
 ${PYSITELIB}/future/backports/xmlrpc/client.pyc
 ${PYSITELIB}/future/backports/xmlrpc/client.pyo
-${PLIST.py2x}${PYSITELIB}/future/backports/xmlrpc/server.py
+${PYSITELIB}/future/backports/xmlrpc/server.py
 ${PYSITELIB}/future/backports/xmlrpc/server.pyc
 ${PYSITELIB}/future/backports/xmlrpc/server.pyo
 ${PYSITELIB}/future/builtins/__init__.py
 ${PYSITELIB}/future/builtins/__init__.pyc
 ${PYSITELIB}/future/builtins/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/builtins/disabled.py
+${PYSITELIB}/future/builtins/disabled.py
 ${PYSITELIB}/future/builtins/disabled.pyc
 ${PYSITELIB}/future/builtins/disabled.pyo
-${PLIST.py2x}${PYSITELIB}/future/builtins/iterators.py
+${PYSITELIB}/future/builtins/iterators.py
 ${PYSITELIB}/future/builtins/iterators.pyc
 ${PYSITELIB}/future/builtins/iterators.pyo
-${PLIST.py2x}${PYSITELIB}/future/builtins/misc.py
+${PYSITELIB}/future/builtins/misc.py
 ${PYSITELIB}/future/builtins/misc.pyc
 ${PYSITELIB}/future/builtins/misc.pyo
 ${PYSITELIB}/future/builtins/new_min_max.py
 ${PYSITELIB}/future/builtins/new_min_max.pyc
 ${PYSITELIB}/future/builtins/new_min_max.pyo
-${PLIST.py2x}${PYSITELIB}/future/builtins/newnext.py
+${PYSITELIB}/future/builtins/newnext.py
 ${PYSITELIB}/future/builtins/newnext.pyc
 ${PYSITELIB}/future/builtins/newnext.pyo
-${PLIST.py2x}${PYSITELIB}/future/builtins/newround.py
+${PYSITELIB}/future/builtins/newround.py
 ${PYSITELIB}/future/builtins/newround.pyc
 ${PYSITELIB}/future/builtins/newround.pyo
-${PLIST.py2x}${PYSITELIB}/future/builtins/newsuper.py
+${PYSITELIB}/future/builtins/newsuper.py
 ${PYSITELIB}/future/builtins/newsuper.pyc
 ${PYSITELIB}/future/builtins/newsuper.pyo
 ${PYSITELIB}/future/moves/__init__.py
 ${PYSITELIB}/future/moves/__init__.pyc
 ${PYSITELIB}/future/moves/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/_dummy_thread.py
+${PYSITELIB}/future/moves/_dummy_thread.py
 ${PYSITELIB}/future/moves/_dummy_thread.pyc
 ${PYSITELIB}/future/moves/_dummy_thread.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/_markupbase.py
+${PYSITELIB}/future/moves/_markupbase.py
 ${PYSITELIB}/future/moves/_markupbase.pyc
 ${PYSITELIB}/future/moves/_markupbase.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/_thread.py
+${PYSITELIB}/future/moves/_thread.py
 ${PYSITELIB}/future/moves/_thread.pyc
 ${PYSITELIB}/future/moves/_thread.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/builtins.py
+${PYSITELIB}/future/moves/builtins.py
 ${PYSITELIB}/future/moves/builtins.pyc
 ${PYSITELIB}/future/moves/builtins.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/collections.py
+${PYSITELIB}/future/moves/collections.py
 ${PYSITELIB}/future/moves/collections.pyc
 ${PYSITELIB}/future/moves/collections.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/configparser.py
+${PYSITELIB}/future/moves/configparser.py
 ${PYSITELIB}/future/moves/configparser.pyc
 ${PYSITELIB}/future/moves/configparser.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/copyreg.py
+${PYSITELIB}/future/moves/copyreg.py
 ${PYSITELIB}/future/moves/copyreg.pyc
 ${PYSITELIB}/future/moves/copyreg.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/dbm/__init__.py
-${PLIST.py2x}${PYSITELIB}/future/moves/dbm/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/dbm/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/dbm/dumb.py
-${PLIST.py2x}${PYSITELIB}/future/moves/dbm/dumb.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/dbm/dumb.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/dbm/gnu.py
-${PLIST.py2x}${PYSITELIB}/future/moves/dbm/gnu.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/dbm/gnu.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/dbm/ndbm.py
-${PLIST.py2x}${PYSITELIB}/future/moves/dbm/ndbm.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/dbm/ndbm.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/html/__init__.py
-${PLIST.py2x}${PYSITELIB}/future/moves/html/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/html/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/html/entities.py
-${PLIST.py2x}${PYSITELIB}/future/moves/html/entities.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/html/entities.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/html/parser.py
-${PLIST.py2x}${PYSITELIB}/future/moves/html/parser.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/html/parser.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/http/__init__.py
-${PLIST.py2x}${PYSITELIB}/future/moves/http/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/http/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/http/client.py
-${PLIST.py2x}${PYSITELIB}/future/moves/http/client.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/http/client.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/http/cookiejar.py
-${PLIST.py2x}${PYSITELIB}/future/moves/http/cookiejar.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/http/cookiejar.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/http/cookies.py
-${PLIST.py2x}${PYSITELIB}/future/moves/http/cookies.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/http/cookies.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/http/server.py
-${PLIST.py2x}${PYSITELIB}/future/moves/http/server.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/http/server.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/itertools.py
+${PYSITELIB}/future/moves/dbm/__init__.py
+${PYSITELIB}/future/moves/dbm/__init__.pyc
+${PYSITELIB}/future/moves/dbm/__init__.pyo
+${PYSITELIB}/future/moves/dbm/dumb.py
+${PYSITELIB}/future/moves/dbm/dumb.pyc
+${PYSITELIB}/future/moves/dbm/dumb.pyo
+${PYSITELIB}/future/moves/dbm/gnu.py
+${PYSITELIB}/future/moves/dbm/gnu.pyc
+${PYSITELIB}/future/moves/dbm/gnu.pyo
+${PYSITELIB}/future/moves/dbm/ndbm.py
+${PYSITELIB}/future/moves/dbm/ndbm.pyc
+${PYSITELIB}/future/moves/dbm/ndbm.pyo
+${PYSITELIB}/future/moves/html/__init__.py
+${PYSITELIB}/future/moves/html/__init__.pyc
+${PYSITELIB}/future/moves/html/__init__.pyo
+${PYSITELIB}/future/moves/html/entities.py
+${PYSITELIB}/future/moves/html/entities.pyc
+${PYSITELIB}/future/moves/html/entities.pyo
+${PYSITELIB}/future/moves/html/parser.py
+${PYSITELIB}/future/moves/html/parser.pyc
+${PYSITELIB}/future/moves/html/parser.pyo
+${PYSITELIB}/future/moves/http/__init__.py
+${PYSITELIB}/future/moves/http/__init__.pyc
+${PYSITELIB}/future/moves/http/__init__.pyo
+${PYSITELIB}/future/moves/http/client.py
+${PYSITELIB}/future/moves/http/client.pyc
+${PYSITELIB}/future/moves/http/client.pyo
+${PYSITELIB}/future/moves/http/cookiejar.py
+${PYSITELIB}/future/moves/http/cookiejar.pyc
+${PYSITELIB}/future/moves/http/cookiejar.pyo
+${PYSITELIB}/future/moves/http/cookies.py
+${PYSITELIB}/future/moves/http/cookies.pyc
+${PYSITELIB}/future/moves/http/cookies.pyo
+${PYSITELIB}/future/moves/http/server.py
+${PYSITELIB}/future/moves/http/server.pyc
+${PYSITELIB}/future/moves/http/server.pyo
+${PYSITELIB}/future/moves/itertools.py
 ${PYSITELIB}/future/moves/itertools.pyc
 ${PYSITELIB}/future/moves/itertools.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/pickle.py
+${PYSITELIB}/future/moves/pickle.py
 ${PYSITELIB}/future/moves/pickle.pyc
 ${PYSITELIB}/future/moves/pickle.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/queue.py
+${PYSITELIB}/future/moves/queue.py
 ${PYSITELIB}/future/moves/queue.pyc
 ${PYSITELIB}/future/moves/queue.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/reprlib.py
+${PYSITELIB}/future/moves/reprlib.py
 ${PYSITELIB}/future/moves/reprlib.pyc
 ${PYSITELIB}/future/moves/reprlib.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/socketserver.py
+${PYSITELIB}/future/moves/socketserver.py
 ${PYSITELIB}/future/moves/socketserver.pyc
 ${PYSITELIB}/future/moves/socketserver.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/subprocess.py
+${PYSITELIB}/future/moves/subprocess.py
 ${PYSITELIB}/future/moves/subprocess.pyc
 ${PYSITELIB}/future/moves/subprocess.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/sys.py
+${PYSITELIB}/future/moves/sys.py
 ${PYSITELIB}/future/moves/sys.pyc
 ${PYSITELIB}/future/moves/sys.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/test/__init__.py
-${PLIST.py2x}${PYSITELIB}/future/moves/test/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/test/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/test/support.py
-${PLIST.py2x}${PYSITELIB}/future/moves/test/support.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/test/support.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/__init__.py
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/colorchooser.py
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/colorchooser.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/colorchooser.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/commondialog.py
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/commondialog.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/commondialog.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/constants.py
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/constants.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/constants.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/dialog.py
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/dialog.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/dialog.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/dnd.py
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/dnd.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/dnd.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/filedialog.py
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/filedialog.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/filedialog.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/font.py
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/font.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/font.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/messagebox.py
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/messagebox.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/messagebox.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/scrolledtext.py
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/scrolledtext.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/scrolledtext.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/simpledialog.py
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/simpledialog.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/simpledialog.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/tix.py
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/tix.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/tix.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/ttk.py
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/ttk.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/tkinter/ttk.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/urllib/__init__.py
-${PLIST.py2x}${PYSITELIB}/future/moves/urllib/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/urllib/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/urllib/error.py
-${PLIST.py2x}${PYSITELIB}/future/moves/urllib/error.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/urllib/error.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/urllib/parse.py
-${PLIST.py2x}${PYSITELIB}/future/moves/urllib/parse.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/urllib/parse.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/urllib/request.py
-${PLIST.py2x}${PYSITELIB}/future/moves/urllib/request.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/urllib/request.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/urllib/response.py
-${PLIST.py2x}${PYSITELIB}/future/moves/urllib/response.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/urllib/response.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/urllib/robotparser.py
-${PLIST.py2x}${PYSITELIB}/future/moves/urllib/robotparser.pyc
-${PLIST.py2x}${PYSITELIB}/future/moves/urllib/robotparser.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/winreg.py
+${PYSITELIB}/future/moves/test/__init__.py
+${PYSITELIB}/future/moves/test/__init__.pyc
+${PYSITELIB}/future/moves/test/__init__.pyo
+${PYSITELIB}/future/moves/test/support.py
+${PYSITELIB}/future/moves/test/support.pyc
+${PYSITELIB}/future/moves/test/support.pyo
+${PYSITELIB}/future/moves/tkinter/__init__.py
+${PYSITELIB}/future/moves/tkinter/__init__.pyc
+${PYSITELIB}/future/moves/tkinter/__init__.pyo
+${PYSITELIB}/future/moves/tkinter/colorchooser.py
+${PYSITELIB}/future/moves/tkinter/colorchooser.pyc
+${PYSITELIB}/future/moves/tkinter/colorchooser.pyo
+${PYSITELIB}/future/moves/tkinter/commondialog.py
+${PYSITELIB}/future/moves/tkinter/commondialog.pyc
+${PYSITELIB}/future/moves/tkinter/commondialog.pyo
+${PYSITELIB}/future/moves/tkinter/constants.py
+${PYSITELIB}/future/moves/tkinter/constants.pyc
+${PYSITELIB}/future/moves/tkinter/constants.pyo
+${PYSITELIB}/future/moves/tkinter/dialog.py
+${PYSITELIB}/future/moves/tkinter/dialog.pyc
+${PYSITELIB}/future/moves/tkinter/dialog.pyo
+${PYSITELIB}/future/moves/tkinter/dnd.py
+${PYSITELIB}/future/moves/tkinter/dnd.pyc
+${PYSITELIB}/future/moves/tkinter/dnd.pyo
+${PYSITELIB}/future/moves/tkinter/filedialog.py
+${PYSITELIB}/future/moves/tkinter/filedialog.pyc
+${PYSITELIB}/future/moves/tkinter/filedialog.pyo
+${PYSITELIB}/future/moves/tkinter/font.py
+${PYSITELIB}/future/moves/tkinter/font.pyc
+${PYSITELIB}/future/moves/tkinter/font.pyo
+${PYSITELIB}/future/moves/tkinter/messagebox.py
+${PYSITELIB}/future/moves/tkinter/messagebox.pyc
+${PYSITELIB}/future/moves/tkinter/messagebox.pyo
+${PYSITELIB}/future/moves/tkinter/scrolledtext.py
+${PYSITELIB}/future/moves/tkinter/scrolledtext.pyc
+${PYSITELIB}/future/moves/tkinter/scrolledtext.pyo
+${PYSITELIB}/future/moves/tkinter/simpledialog.py
+${PYSITELIB}/future/moves/tkinter/simpledialog.pyc
+${PYSITELIB}/future/moves/tkinter/simpledialog.pyo
+${PYSITELIB}/future/moves/tkinter/tix.py
+${PYSITELIB}/future/moves/tkinter/tix.pyc
+${PYSITELIB}/future/moves/tkinter/tix.pyo
+${PYSITELIB}/future/moves/tkinter/ttk.py
+${PYSITELIB}/future/moves/tkinter/ttk.pyc
+${PYSITELIB}/future/moves/tkinter/ttk.pyo
+${PYSITELIB}/future/moves/urllib/__init__.py
+${PYSITELIB}/future/moves/urllib/__init__.pyc
+${PYSITELIB}/future/moves/urllib/__init__.pyo
+${PYSITELIB}/future/moves/urllib/error.py
+${PYSITELIB}/future/moves/urllib/error.pyc
+${PYSITELIB}/future/moves/urllib/error.pyo
+${PYSITELIB}/future/moves/urllib/parse.py
+${PYSITELIB}/future/moves/urllib/parse.pyc
+${PYSITELIB}/future/moves/urllib/parse.pyo
+${PYSITELIB}/future/moves/urllib/request.py
+${PYSITELIB}/future/moves/urllib/request.pyc
+${PYSITELIB}/future/moves/urllib/request.pyo
+${PYSITELIB}/future/moves/urllib/response.py
+${PYSITELIB}/future/moves/urllib/response.pyc
+${PYSITELIB}/future/moves/urllib/response.pyo
+${PYSITELIB}/future/moves/urllib/robotparser.py
+${PYSITELIB}/future/moves/urllib/robotparser.pyc
+${PYSITELIB}/future/moves/urllib/robotparser.pyo
+${PYSITELIB}/future/moves/winreg.py
 ${PYSITELIB}/future/moves/winreg.pyc
 ${PYSITELIB}/future/moves/winreg.pyo
 ${PYSITELIB}/future/moves/xmlrpc/__init__.py
 ${PYSITELIB}/future/moves/xmlrpc/__init__.pyc
 ${PYSITELIB}/future/moves/xmlrpc/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/xmlrpc/client.py
+${PYSITELIB}/future/moves/xmlrpc/client.py
 ${PYSITELIB}/future/moves/xmlrpc/client.pyc
 ${PYSITELIB}/future/moves/xmlrpc/client.pyo
-${PLIST.py2x}${PYSITELIB}/future/moves/xmlrpc/server.py
+${PYSITELIB}/future/moves/xmlrpc/server.py
 ${PYSITELIB}/future/moves/xmlrpc/server.pyc
 ${PYSITELIB}/future/moves/xmlrpc/server.pyo
 ${PYSITELIB}/future/standard_library/__init__.py
@@ -392,43 +392,43 @@ ${PYSITELIB}/future/standard_library/__i
 ${PYSITELIB}/future/tests/__init__.py
 ${PYSITELIB}/future/tests/__init__.pyc
 ${PYSITELIB}/future/tests/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/tests/base.py
+${PYSITELIB}/future/tests/base.py
 ${PYSITELIB}/future/tests/base.pyc
 ${PYSITELIB}/future/tests/base.pyo
 ${PYSITELIB}/future/types/__init__.py
 ${PYSITELIB}/future/types/__init__.pyc
 ${PYSITELIB}/future/types/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/types/newbytes.py
+${PYSITELIB}/future/types/newbytes.py
 ${PYSITELIB}/future/types/newbytes.pyc
 ${PYSITELIB}/future/types/newbytes.pyo
-${PLIST.py2x}${PYSITELIB}/future/types/newdict.py
+${PYSITELIB}/future/types/newdict.py
 ${PYSITELIB}/future/types/newdict.pyc
 ${PYSITELIB}/future/types/newdict.pyo
-${PLIST.py2x}${PYSITELIB}/future/types/newint.py
+${PYSITELIB}/future/types/newint.py
 ${PYSITELIB}/future/types/newint.pyc
 ${PYSITELIB}/future/types/newint.pyo
-${PLIST.py2x}${PYSITELIB}/future/types/newlist.py
+${PYSITELIB}/future/types/newlist.py
 ${PYSITELIB}/future/types/newlist.pyc
 ${PYSITELIB}/future/types/newlist.pyo
-${PLIST.py2x}${PYSITELIB}/future/types/newmemoryview.py
+${PYSITELIB}/future/types/newmemoryview.py
 ${PYSITELIB}/future/types/newmemoryview.pyc
 ${PYSITELIB}/future/types/newmemoryview.pyo
-${PLIST.py2x}${PYSITELIB}/future/types/newobject.py
+${PYSITELIB}/future/types/newobject.py
 ${PYSITELIB}/future/types/newobject.pyc
 ${PYSITELIB}/future/types/newobject.pyo
-${PLIST.py2x}${PYSITELIB}/future/types/newopen.py
+${PYSITELIB}/future/types/newopen.py
 ${PYSITELIB}/future/types/newopen.pyc
 ${PYSITELIB}/future/types/newopen.pyo
-${PLIST.py2x}${PYSITELIB}/future/types/newrange.py
+${PYSITELIB}/future/types/newrange.py
 ${PYSITELIB}/future/types/newrange.pyc
 ${PYSITELIB}/future/types/newrange.pyo
-${PLIST.py2x}${PYSITELIB}/future/types/newstr.py
+${PYSITELIB}/future/types/newstr.py
 ${PYSITELIB}/future/types/newstr.pyc
 ${PYSITELIB}/future/types/newstr.pyo
 ${PYSITELIB}/future/utils/__init__.py
 ${PYSITELIB}/future/utils/__init__.pyc
 ${PYSITELIB}/future/utils/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/future/utils/surrogateescape.py
+${PYSITELIB}/future/utils/surrogateescape.py
 ${PYSITELIB}/future/utils/surrogateescape.pyc
 ${PYSITELIB}/future/utils/surrogateescape.pyo
 ${PLIST.py2x}${PYSITELIB}/html/__init__.py
@@ -458,163 +458,163 @@ ${PLIST.py2x}${PYSITELIB}/http/server.py
 ${PYSITELIB}/libfuturize/__init__.py
 ${PYSITELIB}/libfuturize/__init__.pyc
 ${PYSITELIB}/libfuturize/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixer_util.py
+${PYSITELIB}/libfuturize/fixer_util.py
 ${PYSITELIB}/libfuturize/fixer_util.pyc
 ${PYSITELIB}/libfuturize/fixer_util.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/__init__.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_UserDict.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_UserDict.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_UserDict.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_absolute_import.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_absolute_import.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_absolute_import.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_add__future__imports_except_unicode_literals.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_add__future__imports_except_unicode_literals.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_add__future__imports_except_unicode_literals.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_basestring.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_basestring.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_basestring.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_bytes.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_bytes.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_bytes.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_cmp.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_cmp.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_cmp.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_division.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_division.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_division.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_division_safe.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_division_safe.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_division_safe.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_execfile.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_execfile.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_execfile.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_future_builtins.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_future_builtins.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_future_builtins.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_future_standard_library.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_future_standard_library.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_future_standard_library.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_future_standard_library_urllib.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_future_standard_library_urllib.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_future_standard_library_urllib.pyo
+${PYSITELIB}/libfuturize/fixes/__init__.py
+${PYSITELIB}/libfuturize/fixes/__init__.pyc
+${PYSITELIB}/libfuturize/fixes/__init__.pyo
+${PYSITELIB}/libfuturize/fixes/fix_UserDict.py
+${PYSITELIB}/libfuturize/fixes/fix_UserDict.pyc
+${PYSITELIB}/libfuturize/fixes/fix_UserDict.pyo
+${PYSITELIB}/libfuturize/fixes/fix_absolute_import.py
+${PYSITELIB}/libfuturize/fixes/fix_absolute_import.pyc
+${PYSITELIB}/libfuturize/fixes/fix_absolute_import.pyo
+${PYSITELIB}/libfuturize/fixes/fix_add__future__imports_except_unicode_literals.py
+${PYSITELIB}/libfuturize/fixes/fix_add__future__imports_except_unicode_literals.pyc
+${PYSITELIB}/libfuturize/fixes/fix_add__future__imports_except_unicode_literals.pyo
+${PYSITELIB}/libfuturize/fixes/fix_basestring.py
+${PYSITELIB}/libfuturize/fixes/fix_basestring.pyc
+${PYSITELIB}/libfuturize/fixes/fix_basestring.pyo
+${PYSITELIB}/libfuturize/fixes/fix_bytes.py
+${PYSITELIB}/libfuturize/fixes/fix_bytes.pyc
+${PYSITELIB}/libfuturize/fixes/fix_bytes.pyo
+${PYSITELIB}/libfuturize/fixes/fix_cmp.py
+${PYSITELIB}/libfuturize/fixes/fix_cmp.pyc
+${PYSITELIB}/libfuturize/fixes/fix_cmp.pyo
+${PYSITELIB}/libfuturize/fixes/fix_division.py
+${PYSITELIB}/libfuturize/fixes/fix_division.pyc
+${PYSITELIB}/libfuturize/fixes/fix_division.pyo
+${PYSITELIB}/libfuturize/fixes/fix_division_safe.py
+${PYSITELIB}/libfuturize/fixes/fix_division_safe.pyc
+${PYSITELIB}/libfuturize/fixes/fix_division_safe.pyo
+${PYSITELIB}/libfuturize/fixes/fix_execfile.py
+${PYSITELIB}/libfuturize/fixes/fix_execfile.pyc
+${PYSITELIB}/libfuturize/fixes/fix_execfile.pyo
+${PYSITELIB}/libfuturize/fixes/fix_future_builtins.py
+${PYSITELIB}/libfuturize/fixes/fix_future_builtins.pyc
+${PYSITELIB}/libfuturize/fixes/fix_future_builtins.pyo
+${PYSITELIB}/libfuturize/fixes/fix_future_standard_library.py
+${PYSITELIB}/libfuturize/fixes/fix_future_standard_library.pyc
+${PYSITELIB}/libfuturize/fixes/fix_future_standard_library.pyo
+${PYSITELIB}/libfuturize/fixes/fix_future_standard_library_urllib.py
+${PYSITELIB}/libfuturize/fixes/fix_future_standard_library_urllib.pyc
+${PYSITELIB}/libfuturize/fixes/fix_future_standard_library_urllib.pyo
 ${PYSITELIB}/libfuturize/fixes/fix_input.py
 ${PYSITELIB}/libfuturize/fixes/fix_input.pyc
 ${PYSITELIB}/libfuturize/fixes/fix_input.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_metaclass.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_metaclass.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_metaclass.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_next_call.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_next_call.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_next_call.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_object.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_object.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_object.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_oldstr_wrap.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_oldstr_wrap.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_oldstr_wrap.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_order___future__imports.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_order___future__imports.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_order___future__imports.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_print.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_print.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_print.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_print_with_import.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_print_with_import.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_print_with_import.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_raise.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_raise.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_raise.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_remove_old__future__imports.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_remove_old__future__imports.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_remove_old__future__imports.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_unicode_keep_u.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_unicode_keep_u.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_unicode_keep_u.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_unicode_literals_import.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_unicode_literals_import.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_unicode_literals_import.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_xrange_with_import.py
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_xrange_with_import.pyc
-${PLIST.py2x}${PYSITELIB}/libfuturize/fixes/fix_xrange_with_import.pyo
-${PLIST.py2x}${PYSITELIB}/libfuturize/main.py
+${PYSITELIB}/libfuturize/fixes/fix_metaclass.py
+${PYSITELIB}/libfuturize/fixes/fix_metaclass.pyc
+${PYSITELIB}/libfuturize/fixes/fix_metaclass.pyo
+${PYSITELIB}/libfuturize/fixes/fix_next_call.py
+${PYSITELIB}/libfuturize/fixes/fix_next_call.pyc
+${PYSITELIB}/libfuturize/fixes/fix_next_call.pyo
+${PYSITELIB}/libfuturize/fixes/fix_object.py
+${PYSITELIB}/libfuturize/fixes/fix_object.pyc
+${PYSITELIB}/libfuturize/fixes/fix_object.pyo
+${PYSITELIB}/libfuturize/fixes/fix_oldstr_wrap.py
+${PYSITELIB}/libfuturize/fixes/fix_oldstr_wrap.pyc
+${PYSITELIB}/libfuturize/fixes/fix_oldstr_wrap.pyo
+${PYSITELIB}/libfuturize/fixes/fix_order___future__imports.py
+${PYSITELIB}/libfuturize/fixes/fix_order___future__imports.pyc
+${PYSITELIB}/libfuturize/fixes/fix_order___future__imports.pyo
+${PYSITELIB}/libfuturize/fixes/fix_print.py
+${PYSITELIB}/libfuturize/fixes/fix_print.pyc
+${PYSITELIB}/libfuturize/fixes/fix_print.pyo
+${PYSITELIB}/libfuturize/fixes/fix_print_with_import.py
+${PYSITELIB}/libfuturize/fixes/fix_print_with_import.pyc
+${PYSITELIB}/libfuturize/fixes/fix_print_with_import.pyo
+${PYSITELIB}/libfuturize/fixes/fix_raise.py
+${PYSITELIB}/libfuturize/fixes/fix_raise.pyc
+${PYSITELIB}/libfuturize/fixes/fix_raise.pyo
+${PYSITELIB}/libfuturize/fixes/fix_remove_old__future__imports.py
+${PYSITELIB}/libfuturize/fixes/fix_remove_old__future__imports.pyc
+${PYSITELIB}/libfuturize/fixes/fix_remove_old__future__imports.pyo
+${PYSITELIB}/libfuturize/fixes/fix_unicode_keep_u.py
+${PYSITELIB}/libfuturize/fixes/fix_unicode_keep_u.pyc
+${PYSITELIB}/libfuturize/fixes/fix_unicode_keep_u.pyo
+${PYSITELIB}/libfuturize/fixes/fix_unicode_literals_import.py
+${PYSITELIB}/libfuturize/fixes/fix_unicode_literals_import.pyc
+${PYSITELIB}/libfuturize/fixes/fix_unicode_literals_import.pyo
+${PYSITELIB}/libfuturize/fixes/fix_xrange_with_import.py
+${PYSITELIB}/libfuturize/fixes/fix_xrange_with_import.pyc
+${PYSITELIB}/libfuturize/fixes/fix_xrange_with_import.pyo
+${PYSITELIB}/libfuturize/main.py
 ${PYSITELIB}/libfuturize/main.pyc
 ${PYSITELIB}/libfuturize/main.pyo
 ${PYSITELIB}/libpasteurize/__init__.py
 ${PYSITELIB}/libpasteurize/__init__.pyc
 ${PYSITELIB}/libpasteurize/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/__init__.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/feature_base.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/feature_base.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/feature_base.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_add_all__future__imports.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_add_all__future__imports.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_add_all__future__imports.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_add_all_future_builtins.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_add_all_future_builtins.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_add_all_future_builtins.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_add_future_standard_library_import.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_add_future_standard_library_import.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_add_future_standard_library_import.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_annotations.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_annotations.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_annotations.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_division.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_division.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_division.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_features.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_features.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_features.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_fullargspec.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_fullargspec.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_fullargspec.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_future_builtins.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_future_builtins.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_future_builtins.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_getcwd.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_getcwd.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_getcwd.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_imports.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_imports.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_imports.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_imports2.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_imports2.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_imports2.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_kwargs.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_kwargs.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_kwargs.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_memoryview.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_memoryview.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_memoryview.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_metaclass.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_metaclass.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_metaclass.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_newstyle.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_newstyle.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_newstyle.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_next.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_next.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_next.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_printfunction.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_printfunction.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_printfunction.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_raise.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_raise.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_raise.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_raise_.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_raise_.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_raise_.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_throw.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_throw.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_throw.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_unpacking.py
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_unpacking.pyc
-${PLIST.py2x}${PYSITELIB}/libpasteurize/fixes/fix_unpacking.pyo
-${PLIST.py2x}${PYSITELIB}/libpasteurize/main.py
+${PYSITELIB}/libpasteurize/fixes/__init__.py
+${PYSITELIB}/libpasteurize/fixes/__init__.pyc
+${PYSITELIB}/libpasteurize/fixes/__init__.pyo
+${PYSITELIB}/libpasteurize/fixes/feature_base.py
+${PYSITELIB}/libpasteurize/fixes/feature_base.pyc
+${PYSITELIB}/libpasteurize/fixes/feature_base.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_add_all__future__imports.py
+${PYSITELIB}/libpasteurize/fixes/fix_add_all__future__imports.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_add_all__future__imports.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_add_all_future_builtins.py
+${PYSITELIB}/libpasteurize/fixes/fix_add_all_future_builtins.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_add_all_future_builtins.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_add_future_standard_library_import.py
+${PYSITELIB}/libpasteurize/fixes/fix_add_future_standard_library_import.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_add_future_standard_library_import.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_annotations.py
+${PYSITELIB}/libpasteurize/fixes/fix_annotations.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_annotations.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_division.py
+${PYSITELIB}/libpasteurize/fixes/fix_division.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_division.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_features.py
+${PYSITELIB}/libpasteurize/fixes/fix_features.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_features.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_fullargspec.py
+${PYSITELIB}/libpasteurize/fixes/fix_fullargspec.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_fullargspec.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_future_builtins.py
+${PYSITELIB}/libpasteurize/fixes/fix_future_builtins.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_future_builtins.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_getcwd.py
+${PYSITELIB}/libpasteurize/fixes/fix_getcwd.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_getcwd.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_imports.py
+${PYSITELIB}/libpasteurize/fixes/fix_imports.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_imports.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_imports2.py
+${PYSITELIB}/libpasteurize/fixes/fix_imports2.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_imports2.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_kwargs.py
+${PYSITELIB}/libpasteurize/fixes/fix_kwargs.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_kwargs.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_memoryview.py
+${PYSITELIB}/libpasteurize/fixes/fix_memoryview.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_memoryview.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_metaclass.py
+${PYSITELIB}/libpasteurize/fixes/fix_metaclass.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_metaclass.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_newstyle.py
+${PYSITELIB}/libpasteurize/fixes/fix_newstyle.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_newstyle.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_next.py
+${PYSITELIB}/libpasteurize/fixes/fix_next.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_next.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_printfunction.py
+${PYSITELIB}/libpasteurize/fixes/fix_printfunction.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_printfunction.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_raise.py
+${PYSITELIB}/libpasteurize/fixes/fix_raise.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_raise.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_raise_.py
+${PYSITELIB}/libpasteurize/fixes/fix_raise_.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_raise_.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_throw.py
+${PYSITELIB}/libpasteurize/fixes/fix_throw.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_throw.pyo
+${PYSITELIB}/libpasteurize/fixes/fix_unpacking.py
+${PYSITELIB}/libpasteurize/fixes/fix_unpacking.pyc
+${PYSITELIB}/libpasteurize/fixes/fix_unpacking.pyo
+${PYSITELIB}/libpasteurize/main.py
 ${PYSITELIB}/libpasteurize/main.pyc
 ${PYSITELIB}/libpasteurize/main.pyo
 ${PYSITELIB}/past/__init__.py
@@ -623,10 +623,10 @@ ${PYSITELIB}/past/__init__.pyo
 ${PYSITELIB}/past/builtins/__init__.py
 ${PYSITELIB}/past/builtins/__init__.pyc
 ${PYSITELIB}/past/builtins/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/past/builtins/misc.py
+${PYSITELIB}/past/builtins/misc.py
 ${PYSITELIB}/past/builtins/misc.pyc
 ${PYSITELIB}/past/builtins/misc.pyo
-${PLIST.py2x}${PYSITELIB}/past/builtins/noniterators.py
+${PYSITELIB}/past/builtins/noniterators.py
 ${PYSITELIB}/past/builtins/noniterators.pyc
 ${PYSITELIB}/past/builtins/noniterators.pyo
 ${PYSITELIB}/past/translation/__init__.py
@@ -635,13 +635,13 @@ ${PYSITELIB}/past/translation/__init__.p
 ${PYSITELIB}/past/types/__init__.py
 ${PYSITELIB}/past/types/__init__.pyc
 ${PYSITELIB}/past/types/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/past/types/basestring.py
+${PYSITELIB}/past/types/basestring.py
 ${PYSITELIB}/past/types/basestring.pyc
 ${PYSITELIB}/past/types/basestring.pyo
-${PLIST.py2x}${PYSITELIB}/past/types/olddict.py
+${PYSITELIB}/past/types/olddict.py
 ${PYSITELIB}/past/types/olddict.pyc
 ${PYSITELIB}/past/types/olddict.pyo
-${PLIST.py2x}${PYSITELIB}/past/types/oldstr.py
+${PYSITELIB}/past/types/oldstr.py
 ${PYSITELIB}/past/types/oldstr.pyc
 ${PYSITELIB}/past/types/oldstr.pyo
 ${PYSITELIB}/past/utils/__init__.py