5 files changed, 24 insertions, 207 deletions

diff --git a/devel/py-pylib/Makefile b/devel/py-pylib/Makefile
index 51380fc06341..a88faa3d04e7 100644
--- a/devel/py-pylib/Makefile
+++ b/devel/py-pylib/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pylib
-PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTVERSION=	1.4.4
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_CHEESESHOP}
 MASTER_SITE_SUBDIR=	source/p/py
@@ -17,17 +16,18 @@ DISTNAME=	py-${PORTVERSION}
 MAINTAINER=	yzlin@FreeBSD.org
 COMMENT=	An agile development and test support library
 
+LICENSE=	MIT
+
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	py
-
-PLIST_SUB+=	PY_VER=${PYTHON_VERSION:S,python,,}
+USE_ZIP=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 
-PORTDOCS=	CHANGELOG LICENSE README.txt
+PORTDOCS=	CHANGELOG README.txt
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/py-pylib/distinfo b/devel/py-pylib/distinfo
index 0b5c42b9ea3f..c5f7877fe54b 100644
--- a/devel/py-pylib/distinfo
+++ b/devel/py-pylib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (py-1.2.0.tar.gz) = 1b7349b52aeee1fc69d2fb6e30e6c642179ae78f8a671041c4759fe0fcd1d287
-SIZE (py-1.2.0.tar.gz) = 373192
+SHA256 (py-1.4.4.zip) = 6e688e8d037d23a7fc2c79d321eae91ba3b5f2d797101f6e2c9a8189839d6a22
+SIZE (py-1.4.4.zip) = 225304
diff --git a/devel/py-pylib/files/patch-setup.py b/devel/py-pylib/files/patch-setup.py
deleted file mode 100644
index e916822b3b99..000000000000
--- a/devel/py-pylib/files/patch-setup.py
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- setup.py.orig
-+++ setup.py
-@@ -1,7 +1,4 @@
- import os, sys
--if sys.version_info >= (3,0):
--    from distribute_setup import use_setuptools
--    use_setuptools()
- from setuptools import setup
- 
- long_description = """
diff --git a/devel/py-pylib/pkg-descr b/devel/py-pylib/pkg-descr
index 6f9142c91371..97dee45bd14a 100644
--- a/devel/py-pylib/pkg-descr
+++ b/devel/py-pylib/pkg-descr
@@ -1,14 +1,9 @@
 The pylib is a development support library featuring these tools and APIs:
 
-    * py.test:
-        cross-project testing tool with many advanced features
-    * py.execnet:
-        ad-hoc code distribution to SSH, Socket and local sub processes
-    * py.magic.greenlet:
-        micro-threads on standard CPython ("stackless-light") and PyPy
-    * py.path:
-        path abstractions over local and subversion files
-    * py.code:
-        dynamic code compile and traceback printing support
+        * py.path:  uniform local and svn path objects
+        * py.apipkg:  explicit API control and lazy-importing
+        * py.iniconfig:  easy parsing of .ini files
+        * py.code: dynamic code generation and introspection
+        * py.path:  uniform local and svn path objects
 
 WWW:	http://pylib.org
diff --git a/devel/py-pylib/pkg-plist b/devel/py-pylib/pkg-plist
index 6ed249355941..ce52d937a1c5 100644
--- a/devel/py-pylib/pkg-plist
+++ b/devel/py-pylib/pkg-plist
@@ -1,17 +1,6 @@
-@comment $FreeBSD$
-bin/py.cleanup
-bin/py.convert_unittest
-bin/py.countloc
-bin/py.lookup
-bin/py.svnwcrevert
-bin/py.test
-bin/py.test-%%PY_VER%%
-bin/py.which
-bin/py.which-%%PY_VER%%
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/__init__.py
@@ -20,33 +9,12 @@ bin/py.which-%%PY_VER%%
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/__metainfo.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/__metainfo.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/__metainfo.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_apipkg.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_apipkg.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_apipkg.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_builtin.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_builtin.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_builtin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pycleanup.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pycleanup.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pycleanup.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pyconvert_unittest.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pyconvert_unittest.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pyconvert_unittest.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pycountloc.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pycountloc.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pycountloc.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pylookup.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pylookup.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pylookup.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pysvnwcrevert.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pysvnwcrevert.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pysvnwcrevert.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pytest.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pytest.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pytest.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pywhich.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pywhich.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline/pywhich.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_code/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_code/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_code/__init__.pyo
@@ -62,39 +30,24 @@ bin/py.which-%%PY_VER%%
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_code/code.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_code/code.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_code/code.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_code/oldmagic.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_code/oldmagic.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_code/oldmagic.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_code/oldmagic2.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_code/oldmagic2.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_code/oldmagic2.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_code/source.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_code/source.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_code/source.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_compat/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_compat/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_compat/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_compat/dep_doctest.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_compat/dep_doctest.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_compat/dep_doctest.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_compat/dep_optparse.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_compat/dep_optparse.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_compat/dep_optparse.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_compat/dep_subprocess.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_compat/dep_subprocess.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_compat/dep_subprocess.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_compat/dep_textwrap.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_compat/dep_textwrap.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_compat/dep_textwrap.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_error.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_error.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_error.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_iniconfig.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_iniconfig.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_iniconfig.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_io/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_io/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_io/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_io/capture.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_io/capture.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_io/capture.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_io/saferepr.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_io/saferepr.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_io/saferepr.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_io/terminalwriter.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_io/terminalwriter.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_io/terminalwriter.pyo
@@ -125,87 +78,6 @@ bin/py.which-%%PY_VER%%
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_path/svnwc.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_path/svnwc.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_path/svnwc.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/hookspec.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/hookspec.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/hookspec.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest__pytest.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest__pytest.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest__pytest.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_assertion.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_assertion.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_assertion.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_capture.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_capture.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_capture.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_default.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_default.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_default.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_doctest.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_doctest.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_doctest.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_genscript.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_genscript.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_genscript.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_helpconfig.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_helpconfig.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_helpconfig.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_hooklog.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_hooklog.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_hooklog.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_junitxml.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_junitxml.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_junitxml.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_mark.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_mark.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_mark.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_monkeypatch.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_monkeypatch.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_monkeypatch.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_nose.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_nose.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_nose.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_pastebin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_pastebin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_pastebin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_pdb.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_pdb.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_pdb.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_pylint.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_pylint.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_pylint.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_pytester.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_pytester.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_pytester.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_recwarn.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_recwarn.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_recwarn.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_restdoc.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_restdoc.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_restdoc.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_resultlog.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_resultlog.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_resultlog.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_runner.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_runner.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_runner.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_skipping.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_skipping.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_skipping.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_terminal.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_terminal.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_terminal.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_tmpdir.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_tmpdir.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_tmpdir.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_unittest.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_unittest.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/pytest_unittest.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/standalonetemplate.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/standalonetemplate.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin/standalonetemplate.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_process/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_process/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_process/__init__.pyo
@@ -221,54 +93,17 @@ bin/py.which-%%PY_VER%%
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_std.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_std.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_std.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/cmdline.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/cmdline.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/cmdline.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/collect.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/collect.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/collect.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/conftesthandle.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/conftesthandle.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/conftesthandle.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/funcargs.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/funcargs.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/funcargs.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/outcome.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/outcome.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/outcome.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/parseopt.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/parseopt.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/parseopt.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/pluginmanager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/pluginmanager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/pluginmanager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/pycollect.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/pycollect.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/pycollect.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/session.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/session.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test/session.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_xmlgen.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_xmlgen.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_xmlgen.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/apipkg.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/apipkg.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/apipkg.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_test
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/test.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_process
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_plugin
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_path
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_log
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_io
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_compat
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_code
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py/_cmdline
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%