- Update to 2.5.1

3 files changed, 893 insertions, 209 deletions

diff --git a/lang/jython/Makefile b/lang/jython/Makefile
index 58e6c573c5d1..01eb46bc5ac4 100644
--- a/lang/jython/Makefile
+++ b/lang/jython/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jython
-PORTVERSION=	2.2
-PORTREVISION=	1
+PORTVERSION=	2.5.1
 CATEGORIES=	lang python java
 MASTER_SITES=	SF
 DISTNAME=	jython_installer-${PORTVERSION}
@@ -17,12 +16,15 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	An implementation of Python Interpreter in Pure Java
 
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 NO_BUILD=	yes
 REINPLACE_ARGS=	-i ""
 
-INST_TARGET?=	lib/jython${PORTVERSION:S/.//g}
+INST_TARGET?=	lib/jython
 JYTHON_PREFIX=	${PREFIX}/${INST_TARGET}
 PLIST_SUB+=	JYTHON_DIR=${INST_TARGET}
 
@@ -45,7 +47,6 @@ do-install:
 
 	@# Install symbolic links for convenience.
 	-${LN} -sf ${JYTHON_PREFIX}/jython ${PREFIX}/bin/jython
-	-${LN} -sf ${JYTHON_PREFIX}/jythonc ${PREFIX}/bin/jythonc
 	-${LN} -sf ${JYTHON_PREFIX}/registry ${PREFIX}/etc/jython.reg
 
 .include <bsd.port.mk>
diff --git a/lang/jython/distinfo b/lang/jython/distinfo
index a92e29fdb224..4bbd98304214 100644
--- a/lang/jython/distinfo
+++ b/lang/jython/distinfo
@@ -1,3 +1,3 @@
-MD5 (jython_installer-2.2.jar) = aba8e11ed071be7f7c2687624b5e7918
-SHA256 (jython_installer-2.2.jar) = 0ef91919193af5faa48740b11f71cb4fcc1b90038b2c7ae1274033bd00a75f2a
-SIZE (jython_installer-2.2.jar) = 4657295
+MD5 (jython_installer-2.5.1.jar) = 2ee978eff4306b23753b3fe9d7af5b37
+SHA256 (jython_installer-2.5.1.jar) = 229dfd1ed9728aa7e00c71f111d08fa777a4edcd03383779c74216765098f9c5
+SIZE (jython_installer-2.5.1.jar) = 15338930
diff --git a/lang/jython/pkg-plist b/lang/jython/pkg-plist
index c50adf789012..9aa3fb0db693 100644
--- a/lang/jython/pkg-plist
+++ b/lang/jython/pkg-plist
@@ -1,7 +1,7 @@
 bin/jython
-bin/jythonc
 etc/jython.reg
 %%JYTHON_DIR%%/ACKNOWLEDGMENTS
+%%JYTHON_DIR%%/CoreExposed.includes
 %%JYTHON_DIR%%/Demo/applet/ButtonDemo.py
 %%JYTHON_DIR%%/Demo/applet/ButtonFontDemo.py
 %%JYTHON_DIR%%/Demo/applet/CheckboxDemo.py
@@ -26,6 +26,11 @@ etc/jython.reg
 %%JYTHON_DIR%%/Demo/jreload/src/example/PrintVer.java
 %%JYTHON_DIR%%/Demo/jreload/src/example/jar-Version.java
 %%JYTHON_DIR%%/Demo/jreload/src/example/new-Version.java
+%%JYTHON_DIR%%/Demo/modjy_webapp/WEB-INF/lib-python/readme.txt
+%%JYTHON_DIR%%/Demo/modjy_webapp/WEB-INF/lib/readme.txt
+%%JYTHON_DIR%%/Demo/modjy_webapp/WEB-INF/web.xml
+%%JYTHON_DIR%%/Demo/modjy_webapp/demo_app.py
+%%JYTHON_DIR%%/Demo/modjy_webapp/readme.txt
 %%JYTHON_DIR%%/Demo/swing/Action.py
 %%JYTHON_DIR%%/Demo/swing/Console.py
 %%JYTHON_DIR%%/Demo/swing/Keymap.py
@@ -34,16 +39,12 @@ etc/jython.reg
 %%JYTHON_DIR%%/Demo/swing/Styles.py
 %%JYTHON_DIR%%/Demo/swing/TreeDemo.py
 %%JYTHON_DIR%%/Demo/swing/simple.py
-%%JYTHON_DIR%%/Doc/compile.html
-%%JYTHON_DIR%%/Doc/differences.html
-%%JYTHON_DIR%%/Doc/embedding.html
-%%JYTHON_DIR%%/Doc/images/PythonPoweredSmall.gif
-%%JYTHON_DIR%%/Doc/images/jython-new-small.gif
-%%JYTHON_DIR%%/Doc/index.html
-%%JYTHON_DIR%%/Doc/interpreter.html
-%%JYTHON_DIR%%/Doc/jarray.html
 %%JYTHON_DIR%%/Doc/javadoc/allclasses-frame.html
 %%JYTHON_DIR%%/Doc/javadoc/allclasses-noframe.html
+%%JYTHON_DIR%%/Doc/javadoc/com/xhaus/modjy/ModjyJServlet.html
+%%JYTHON_DIR%%/Doc/javadoc/com/xhaus/modjy/package-frame.html
+%%JYTHON_DIR%%/Doc/javadoc/com/xhaus/modjy/package-summary.html
+%%JYTHON_DIR%%/Doc/javadoc/com/xhaus/modjy/package-tree.html
 %%JYTHON_DIR%%/Doc/javadoc/com/ziclix/python/sql/DBApiType.html
 %%JYTHON_DIR%%/Doc/javadoc/com/ziclix/python/sql/DataHandler.html
 %%JYTHON_DIR%%/Doc/javadoc/com/ziclix/python/sql/DateFactory.html
@@ -52,6 +53,7 @@ etc/jython.reg
 %%JYTHON_DIR%%/Doc/javadoc/com/ziclix/python/sql/JDBC20DataHandler.html
 %%JYTHON_DIR%%/Doc/javadoc/com/ziclix/python/sql/JDBC30DataHandler.html
 %%JYTHON_DIR%%/Doc/javadoc/com/ziclix/python/sql/JavaDateFactory.html
+%%JYTHON_DIR%%/Doc/javadoc/com/ziclix/python/sql/Jython22DataHandler.html
 %%JYTHON_DIR%%/Doc/javadoc/com/ziclix/python/sql/Procedure.html
 %%JYTHON_DIR%%/Doc/javadoc/com/ziclix/python/sql/PyConnection.html
 %%JYTHON_DIR%%/Doc/javadoc/com/ziclix/python/sql/PyCursor.html
@@ -69,48 +71,64 @@ etc/jython.reg
 %%JYTHON_DIR%%/Doc/javadoc/index-all.html
 %%JYTHON_DIR%%/Doc/javadoc/index.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/AbstractArray.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/AnnotationReader.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/ArgParser.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/AutoInternalTables.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/ByteSwapper.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/AstList.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/BaseSet.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/BuiltinDocs.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/BytecodeLoader.Loader.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/BytecodeLoader.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/CachedJarsPackageManager.JarXEntry.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/CachedJarsPackageManager.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/ClassDictInit.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/ClasspathPyImporter.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/ClasspathPyImporterDerived.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/CodeBootstrap.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/CodeFlag.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/CodeLoader.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/CompileMode.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/CompilerFacade.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/CompilerFlags.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/ExtraMath.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/FileUtil.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/ContextGuard.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/ContextManager.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/FilelikeInputStream.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/FunctionThread.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/FutureFeature.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/IdImpl.WeakIdentityMap.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/IdImpl.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/IdImpl1.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/IdImpl2.WeakIdentityMap.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/IdImpl2.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/InitModule.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/InternalTables._LazyRep.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/InternalTables.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/InternalTables1.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/InternalTables2.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/JavaImportHelper.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/JavaImporter.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/Loader.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/JythonInitializer.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/NewCompilerResources.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/Opcode.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/Options.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PackageManager.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PathPackageManager.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PrecompiledImporter.PrecompiledLoader.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PrecompiledImporter.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/ParserFacade.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/Pragma.ForbiddenPragmaModule.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/Pragma.PragmaModule.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/Pragma.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PragmaReceiver.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/Py.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyArray.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyArrayDerived.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBaseCode.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBaseException.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBaseExceptionDerived.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBaseString.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBeanEvent.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBeanEventProperty.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBeanProperty.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBuiltinFunction.DefaultInfo.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBuiltinFunction.Info.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBoolean.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBooleanDerived.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBuiltinCallable.DefaultInfo.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBuiltinCallable.Info.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBuiltinCallable.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBuiltinClassMethodNarrow.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBuiltinFunction.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBuiltinFunctionNarrow.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBuiltinFunctionSet.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBuiltinMethod.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBuiltinMethodNarrow.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBuiltinMethodSet.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyBytecode.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyCallIter.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyCell.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyClass.html
@@ -121,37 +139,42 @@ etc/jython.reg
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyComplex.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyComplexDerived.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyCompoundCallable.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyDataDescr.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyDescriptor.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyDictProxy.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyDictionary.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyDictionaryDerived.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyEllipsis.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyEnumerate.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyEnumerateDerived.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyException.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyFieldDescr.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyFastSequenceIter.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyFile.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyFileDerived.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyFileReader.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyFileWriter.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyFinalizableInstance.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyFloat.Format.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyFloat.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyFloatDerived.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyFrame.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyFrozenSet.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyFrozenSetDerived.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyFunction.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyFunctionTable.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyGenerator.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyGetSetDescr.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyIgnoreMethodTag.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyIndentationError.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyInstance.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyInteger.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyIntegerDerived.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyIterator.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyJavaClass.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyJavaInnerClass.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyJavaInstance.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyJavaPackage.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyJavaType.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyList.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyListDerived.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyLong.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyLongDerived.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyMetaClass.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyMethod.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyMethodDescr.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyModule.html
@@ -161,21 +184,25 @@ etc/jython.reg
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyNotImplemented.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyObject.ConversionException.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyObject.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyObjectArray.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyObjectDerived.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyObjectList.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyOverridableNew.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyProperty.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyPropertyDerived.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyProxy.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyReflectedConstructor.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyReflectedField.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyReflectedFunction.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyReversedIterator.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyRunnable.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyRunnableBootstrap.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PySequence.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PySequenceIter.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PySequenceList.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PySet.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PySetDerived.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PySingleton.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PySlice.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PySliceDerived.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PySlot.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyStaticMethod.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyString.html
@@ -189,24 +216,23 @@ etc/jython.reg
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyTraceback.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyTuple.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyTupleDerived.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyType.Newstyle.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyType.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyTypeDerived.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyUnicode.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyUnicodeDerived.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/PyXRange.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PythonCodeBundle.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/PythonCompiler.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/ReflectedArgs.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/SequenceIndexDelegate.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/Slotted.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/SoftIInternalTables.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/StderrWrapper.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/StdoutWrapper.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/SysPackageManager.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/SyspathArchive.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/SyspathJavaLoader.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/ThreadState.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/TraceFunction.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/WeakInternalTables.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/ZipFileImporter.ZipFileLoader.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/ZipFileImporter.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/core/WrappedIterIterator.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/__builtin__.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/codecs.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/exceptions.html
@@ -214,13 +240,19 @@ etc/jython.reg
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/package-frame.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/package-summary.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/package-tree.html
-%%JYTHON_DIR%%/Doc/javadoc/org/python/core/parser.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/core/ucnhashAPI.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/util/Generic.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/util/GlobMatchingTask.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/util/InteractiveConsole.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/util/InteractiveInterpreter.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/util/JLineConsole.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/util/JarRunner.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/util/JycompileAntTask.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/util/JythoncAntTask.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/util/NameUnionAntType.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/util/PyFilter.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/util/PyServlet.html
+%%JYTHON_DIR%%/Doc/javadoc/org/python/util/PyServletInitializer.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/util/PythonInterpreter.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/util/PythonObjectInputStream.html
 %%JYTHON_DIR%%/Doc/javadoc/org/python/util/ReadlineConsole.html
@@ -236,14 +268,6 @@ etc/jython.reg
 %%JYTHON_DIR%%/Doc/javadoc/resources/inherit.gif
 %%JYTHON_DIR%%/Doc/javadoc/serialized-form.html
 %%JYTHON_DIR%%/Doc/javadoc/stylesheet.css
-%%JYTHON_DIR%%/Doc/jreload.html
-%%JYTHON_DIR%%/Doc/jythonc.html
-%%JYTHON_DIR%%/Doc/properties.html
-%%JYTHON_DIR%%/Doc/registry.html
-%%JYTHON_DIR%%/Doc/subclassing.html
-%%JYTHON_DIR%%/Doc/usejava.html
-%%JYTHON_DIR%%/Doc/whatis.html
-%%JYTHON_DIR%%/Doc/zxjdbc.html
 %%JYTHON_DIR%%/LICENSE.txt
 %%JYTHON_DIR%%/LICENSE_Apache.txt
 %%JYTHON_DIR%%/LICENSE_CPython.txt
@@ -251,6 +275,8 @@ etc/jython.reg
 %%JYTHON_DIR%%/Lib/CGIHTTPServer.py
 %%JYTHON_DIR%%/Lib/ConfigParser.py
 %%JYTHON_DIR%%/Lib/Cookie.py
+%%JYTHON_DIR%%/Lib/DocXMLRPCServer.py
+%%JYTHON_DIR%%/Lib/EastAsianWidth.txt
 %%JYTHON_DIR%%/Lib/HTMLParser.py
 %%JYTHON_DIR%%/Lib/MimeWriter.py
 %%JYTHON_DIR%%/Lib/Queue.py
@@ -258,13 +284,21 @@ etc/jython.reg
 %%JYTHON_DIR%%/Lib/SimpleXMLRPCServer.py
 %%JYTHON_DIR%%/Lib/SocketServer.py
 %%JYTHON_DIR%%/Lib/StringIO.py
-%%JYTHON_DIR%%/Lib/UserDict$py.class
+%%JYTHON_DIR%%/Lib/UnicodeData.txt
 %%JYTHON_DIR%%/Lib/UserDict.py
 %%JYTHON_DIR%%/Lib/UserList.py
 %%JYTHON_DIR%%/Lib/UserString.py
+%%JYTHON_DIR%%/Lib/_LWPCookieJar.py
+%%JYTHON_DIR%%/Lib/_MozillaCookieJar.py
 %%JYTHON_DIR%%/Lib/__future__.py
+%%JYTHON_DIR%%/Lib/_rawffi.py
+%%JYTHON_DIR%%/Lib/_strptime.py
+%%JYTHON_DIR%%/Lib/_threading_local.py
 %%JYTHON_DIR%%/Lib/aifc.py
 %%JYTHON_DIR%%/Lib/anydbm.py
+%%JYTHON_DIR%%/Lib/ast.py
+%%JYTHON_DIR%%/Lib/asynchat.py
+%%JYTHON_DIR%%/Lib/asyncore.py
 %%JYTHON_DIR%%/Lib/atexit.py
 %%JYTHON_DIR%%/Lib/base64.py
 %%JYTHON_DIR%%/Lib/bdb.py
@@ -272,45 +306,126 @@ etc/jython.reg
 %%JYTHON_DIR%%/Lib/bisect.py
 %%JYTHON_DIR%%/Lib/calendar.py
 %%JYTHON_DIR%%/Lib/cgi.py
+%%JYTHON_DIR%%/Lib/cgitb.py
 %%JYTHON_DIR%%/Lib/chunk.py
 %%JYTHON_DIR%%/Lib/cmd.py
 %%JYTHON_DIR%%/Lib/code.py
 %%JYTHON_DIR%%/Lib/codecs.py
 %%JYTHON_DIR%%/Lib/codeop.py
+%%JYTHON_DIR%%/Lib/collections/__init__.py
 %%JYTHON_DIR%%/Lib/colorsys.py
 %%JYTHON_DIR%%/Lib/commands.py
 %%JYTHON_DIR%%/Lib/compileall.py
+%%JYTHON_DIR%%/Lib/compiler/__init__.py
+%%JYTHON_DIR%%/Lib/compiler/ast.py
+%%JYTHON_DIR%%/Lib/compiler/consts.py
+%%JYTHON_DIR%%/Lib/compiler/future.py
+%%JYTHON_DIR%%/Lib/compiler/misc.py
+%%JYTHON_DIR%%/Lib/compiler/pyassem.py
+%%JYTHON_DIR%%/Lib/compiler/pycodegen.py
+%%JYTHON_DIR%%/Lib/compiler/symbols.py
+%%JYTHON_DIR%%/Lib/compiler/syntax.py
+%%JYTHON_DIR%%/Lib/compiler/transformer.py
+%%JYTHON_DIR%%/Lib/compiler/visitor.py
+%%JYTHON_DIR%%/Lib/contextlib.py
+%%JYTHON_DIR%%/Lib/cookielib.py
 %%JYTHON_DIR%%/Lib/copy.py
 %%JYTHON_DIR%%/Lib/copy_reg.py
+%%JYTHON_DIR%%/Lib/csv.py
 %%JYTHON_DIR%%/Lib/datetime.py
 %%JYTHON_DIR%%/Lib/dbexts.py
+%%JYTHON_DIR%%/Lib/decimal.py
 %%JYTHON_DIR%%/Lib/difflib.py
 %%JYTHON_DIR%%/Lib/dircache.py
+%%JYTHON_DIR%%/Lib/dis.py
+%%JYTHON_DIR%%/Lib/distutils/README
+%%JYTHON_DIR%%/Lib/distutils/__init__.py
+%%JYTHON_DIR%%/Lib/distutils/archive_util.py
+%%JYTHON_DIR%%/Lib/distutils/bcppcompiler.py
+%%JYTHON_DIR%%/Lib/distutils/ccompiler.py
+%%JYTHON_DIR%%/Lib/distutils/cmd.py
+%%JYTHON_DIR%%/Lib/distutils/command/__init__.py
+%%JYTHON_DIR%%/Lib/distutils/command/bdist.py
+%%JYTHON_DIR%%/Lib/distutils/command/bdist_dumb.py
+%%JYTHON_DIR%%/Lib/distutils/command/bdist_msi.py
+%%JYTHON_DIR%%/Lib/distutils/command/bdist_rpm.py
+%%JYTHON_DIR%%/Lib/distutils/command/bdist_wininst.py
+%%JYTHON_DIR%%/Lib/distutils/command/build.py
+%%JYTHON_DIR%%/Lib/distutils/command/build_clib.py
+%%JYTHON_DIR%%/Lib/distutils/command/build_ext.py
+%%JYTHON_DIR%%/Lib/distutils/command/build_py.py
+%%JYTHON_DIR%%/Lib/distutils/command/build_scripts.py
+%%JYTHON_DIR%%/Lib/distutils/command/clean.py
+%%JYTHON_DIR%%/Lib/distutils/command/command_template
+%%JYTHON_DIR%%/Lib/distutils/command/config.py
+%%JYTHON_DIR%%/Lib/distutils/command/install.py
+%%JYTHON_DIR%%/Lib/distutils/command/install_data.py
+%%JYTHON_DIR%%/Lib/distutils/command/install_egg_info.py
+%%JYTHON_DIR%%/Lib/distutils/command/install_headers.py
+%%JYTHON_DIR%%/Lib/distutils/command/install_lib.py
+%%JYTHON_DIR%%/Lib/distutils/command/install_scripts.py
+%%JYTHON_DIR%%/Lib/distutils/command/register.py
+%%JYTHON_DIR%%/Lib/distutils/command/sdist.py
+%%JYTHON_DIR%%/Lib/distutils/command/upload.py
+%%JYTHON_DIR%%/Lib/distutils/command/wininst-6.exe
+%%JYTHON_DIR%%/Lib/distutils/command/wininst-7.1.exe
+%%JYTHON_DIR%%/Lib/distutils/core.py
+%%JYTHON_DIR%%/Lib/distutils/cygwinccompiler.py
+%%JYTHON_DIR%%/Lib/distutils/debug.py
+%%JYTHON_DIR%%/Lib/distutils/dep_util.py
+%%JYTHON_DIR%%/Lib/distutils/dir_util.py
+%%JYTHON_DIR%%/Lib/distutils/dist.py
+%%JYTHON_DIR%%/Lib/distutils/emxccompiler.py
+%%JYTHON_DIR%%/Lib/distutils/errors.py
+%%JYTHON_DIR%%/Lib/distutils/extension.py
+%%JYTHON_DIR%%/Lib/distutils/fancy_getopt.py
+%%JYTHON_DIR%%/Lib/distutils/file_util.py
+%%JYTHON_DIR%%/Lib/distutils/filelist.py
+%%JYTHON_DIR%%/Lib/distutils/jythoncompiler.py
+%%JYTHON_DIR%%/Lib/distutils/log.py
+%%JYTHON_DIR%%/Lib/distutils/msvccompiler.py
+%%JYTHON_DIR%%/Lib/distutils/mwerkscompiler.py
+%%JYTHON_DIR%%/Lib/distutils/spawn.py
+%%JYTHON_DIR%%/Lib/distutils/sysconfig.py
+%%JYTHON_DIR%%/Lib/distutils/tests/__init__.py
+%%JYTHON_DIR%%/Lib/distutils/tests/support.py
+%%JYTHON_DIR%%/Lib/distutils/tests/test_build_py.py
+%%JYTHON_DIR%%/Lib/distutils/tests/test_build_scripts.py
+%%JYTHON_DIR%%/Lib/distutils/tests/test_dist.py
+%%JYTHON_DIR%%/Lib/distutils/tests/test_install.py
+%%JYTHON_DIR%%/Lib/distutils/tests/test_install_scripts.py
+%%JYTHON_DIR%%/Lib/distutils/tests/test_versionpredicate.py
+%%JYTHON_DIR%%/Lib/distutils/text_file.py
+%%JYTHON_DIR%%/Lib/distutils/unixccompiler.py
+%%JYTHON_DIR%%/Lib/distutils/util.py
+%%JYTHON_DIR%%/Lib/distutils/version.py
+%%JYTHON_DIR%%/Lib/distutils/versionpredicate.py
 %%JYTHON_DIR%%/Lib/doctest.py
-%%JYTHON_DIR%%/Lib/dospath.py
 %%JYTHON_DIR%%/Lib/dumbdbm.py
-%%JYTHON_DIR%%/Lib/email/Charset.py
-%%JYTHON_DIR%%/Lib/email/Encoders.py
-%%JYTHON_DIR%%/Lib/email/Errors.py
-%%JYTHON_DIR%%/Lib/email/Generator.py
-%%JYTHON_DIR%%/Lib/email/Header.py
-%%JYTHON_DIR%%/Lib/email/Iterators.py
-%%JYTHON_DIR%%/Lib/email/MIMEAudio.py
-%%JYTHON_DIR%%/Lib/email/MIMEBase.py
-%%JYTHON_DIR%%/Lib/email/MIMEImage.py
-%%JYTHON_DIR%%/Lib/email/MIMEMessage.py
-%%JYTHON_DIR%%/Lib/email/MIMEMultipart.py
-%%JYTHON_DIR%%/Lib/email/MIMENonMultipart.py
-%%JYTHON_DIR%%/Lib/email/MIMEText.py
-%%JYTHON_DIR%%/Lib/email/Message.py
-%%JYTHON_DIR%%/Lib/email/Parser.py
-%%JYTHON_DIR%%/Lib/email/Utils.py
+%%JYTHON_DIR%%/Lib/dummy_thread.py
+%%JYTHON_DIR%%/Lib/dummy_threading.py
 %%JYTHON_DIR%%/Lib/email/__init__.py
-%%JYTHON_DIR%%/Lib/email/_compat21.py
-%%JYTHON_DIR%%/Lib/email/_compat22.py
 %%JYTHON_DIR%%/Lib/email/_parseaddr.py
-%%JYTHON_DIR%%/Lib/email/base64MIME.py
-%%JYTHON_DIR%%/Lib/email/quopriMIME.py
+%%JYTHON_DIR%%/Lib/email/base64mime.py
+%%JYTHON_DIR%%/Lib/email/charset.py
+%%JYTHON_DIR%%/Lib/email/encoders.py
+%%JYTHON_DIR%%/Lib/email/errors.py
+%%JYTHON_DIR%%/Lib/email/feedparser.py
+%%JYTHON_DIR%%/Lib/email/generator.py
+%%JYTHON_DIR%%/Lib/email/header.py
+%%JYTHON_DIR%%/Lib/email/iterators.py
+%%JYTHON_DIR%%/Lib/email/message.py
+%%JYTHON_DIR%%/Lib/email/mime/__init__.py
+%%JYTHON_DIR%%/Lib/email/mime/application.py
+%%JYTHON_DIR%%/Lib/email/mime/audio.py
+%%JYTHON_DIR%%/Lib/email/mime/base.py
+%%JYTHON_DIR%%/Lib/email/mime/image.py
+%%JYTHON_DIR%%/Lib/email/mime/message.py
+%%JYTHON_DIR%%/Lib/email/mime/multipart.py
+%%JYTHON_DIR%%/Lib/email/mime/nonmultipart.py
+%%JYTHON_DIR%%/Lib/email/mime/text.py
+%%JYTHON_DIR%%/Lib/email/parser.py
+%%JYTHON_DIR%%/Lib/email/quoprimime.py
 %%JYTHON_DIR%%/Lib/email/test/__init__.py
 %%JYTHON_DIR%%/Lib/email/test/data/PyBanner048.gif
 %%JYTHON_DIR%%/Lib/email/test/data/audiotest.au
@@ -326,6 +441,7 @@ etc/jython.reg
 %%JYTHON_DIR%%/Lib/email/test/data/msg_10.txt
 %%JYTHON_DIR%%/Lib/email/test/data/msg_11.txt
 %%JYTHON_DIR%%/Lib/email/test/data/msg_12.txt
+%%JYTHON_DIR%%/Lib/email/test/data/msg_12a.txt
 %%JYTHON_DIR%%/Lib/email/test/data/msg_13.txt
 %%JYTHON_DIR%%/Lib/email/test/data/msg_14.txt
 %%JYTHON_DIR%%/Lib/email/test/data/msg_15.txt
@@ -349,13 +465,28 @@ etc/jython.reg
 %%JYTHON_DIR%%/Lib/email/test/data/msg_33.txt
 %%JYTHON_DIR%%/Lib/email/test/data/msg_34.txt
 %%JYTHON_DIR%%/Lib/email/test/data/msg_35.txt
+%%JYTHON_DIR%%/Lib/email/test/data/msg_36.txt
+%%JYTHON_DIR%%/Lib/email/test/data/msg_37.txt
+%%JYTHON_DIR%%/Lib/email/test/data/msg_38.txt
+%%JYTHON_DIR%%/Lib/email/test/data/msg_39.txt
+%%JYTHON_DIR%%/Lib/email/test/data/msg_40.txt
+%%JYTHON_DIR%%/Lib/email/test/data/msg_41.txt
+%%JYTHON_DIR%%/Lib/email/test/data/msg_42.txt
+%%JYTHON_DIR%%/Lib/email/test/data/msg_43.txt
+%%JYTHON_DIR%%/Lib/email/test/data/msg_44.txt
 %%JYTHON_DIR%%/Lib/email/test/test_email.py
 %%JYTHON_DIR%%/Lib/email/test/test_email_codecs.py
+%%JYTHON_DIR%%/Lib/email/test/test_email_codecs_renamed.py
+%%JYTHON_DIR%%/Lib/email/test/test_email_renamed.py
 %%JYTHON_DIR%%/Lib/email/test/test_email_torture.py
+%%JYTHON_DIR%%/Lib/email/utils.py
 %%JYTHON_DIR%%/Lib/encodings/__init__.py
 %%JYTHON_DIR%%/Lib/encodings/aliases.py
 %%JYTHON_DIR%%/Lib/encodings/ascii.py
 %%JYTHON_DIR%%/Lib/encodings/base64_codec.py
+%%JYTHON_DIR%%/Lib/encodings/big5.py
+%%JYTHON_DIR%%/Lib/encodings/big5hkscs.py
+%%JYTHON_DIR%%/Lib/encodings/bz2_codec.py
 %%JYTHON_DIR%%/Lib/encodings/charmap.py
 %%JYTHON_DIR%%/Lib/encodings/cp037.py
 %%JYTHON_DIR%%/Lib/encodings/cp1006.py
@@ -390,12 +521,34 @@ etc/jython.reg
 %%JYTHON_DIR%%/Lib/encodings/cp869.py
 %%JYTHON_DIR%%/Lib/encodings/cp874.py
 %%JYTHON_DIR%%/Lib/encodings/cp875.py
+%%JYTHON_DIR%%/Lib/encodings/cp932.py
+%%JYTHON_DIR%%/Lib/encodings/cp949.py
+%%JYTHON_DIR%%/Lib/encodings/cp950.py
+%%JYTHON_DIR%%/Lib/encodings/euc_jis_2004.py
+%%JYTHON_DIR%%/Lib/encodings/euc_jisx0213.py
+%%JYTHON_DIR%%/Lib/encodings/euc_jp.py
+%%JYTHON_DIR%%/Lib/encodings/euc_kr.py
+%%JYTHON_DIR%%/Lib/encodings/gb18030.py
+%%JYTHON_DIR%%/Lib/encodings/gb2312.py
+%%JYTHON_DIR%%/Lib/encodings/gbk.py
 %%JYTHON_DIR%%/Lib/encodings/hex_codec.py
+%%JYTHON_DIR%%/Lib/encodings/hp_roman8.py
+%%JYTHON_DIR%%/Lib/encodings/hz.py
+%%JYTHON_DIR%%/Lib/encodings/idna.py
+%%JYTHON_DIR%%/Lib/encodings/iso2022_jp.py
+%%JYTHON_DIR%%/Lib/encodings/iso2022_jp_1.py
+%%JYTHON_DIR%%/Lib/encodings/iso2022_jp_2.py
+%%JYTHON_DIR%%/Lib/encodings/iso2022_jp_2004.py
+%%JYTHON_DIR%%/Lib/encodings/iso2022_jp_3.py
+%%JYTHON_DIR%%/Lib/encodings/iso2022_jp_ext.py
+%%JYTHON_DIR%%/Lib/encodings/iso2022_kr.py
 %%JYTHON_DIR%%/Lib/encodings/iso8859_1.py
 %%JYTHON_DIR%%/Lib/encodings/iso8859_10.py
+%%JYTHON_DIR%%/Lib/encodings/iso8859_11.py
 %%JYTHON_DIR%%/Lib/encodings/iso8859_13.py
 %%JYTHON_DIR%%/Lib/encodings/iso8859_14.py
 %%JYTHON_DIR%%/Lib/encodings/iso8859_15.py
+%%JYTHON_DIR%%/Lib/encodings/iso8859_16.py
 %%JYTHON_DIR%%/Lib/encodings/iso8859_2.py
 %%JYTHON_DIR%%/Lib/encodings/iso8859_3.py
 %%JYTHON_DIR%%/Lib/encodings/iso8859_4.py
@@ -404,19 +557,33 @@ etc/jython.reg
 %%JYTHON_DIR%%/Lib/encodings/iso8859_7.py
 %%JYTHON_DIR%%/Lib/encodings/iso8859_8.py
 %%JYTHON_DIR%%/Lib/encodings/iso8859_9.py
+%%JYTHON_DIR%%/Lib/encodings/johab.py
 %%JYTHON_DIR%%/Lib/encodings/koi8_r.py
 %%JYTHON_DIR%%/Lib/encodings/koi8_u.py
 %%JYTHON_DIR%%/Lib/encodings/latin_1.py
+%%JYTHON_DIR%%/Lib/encodings/mac_arabic.py
+%%JYTHON_DIR%%/Lib/encodings/mac_centeuro.py
+%%JYTHON_DIR%%/Lib/encodings/mac_croatian.py
 %%JYTHON_DIR%%/Lib/encodings/mac_cyrillic.py
+%%JYTHON_DIR%%/Lib/encodings/mac_farsi.py
 %%JYTHON_DIR%%/Lib/encodings/mac_greek.py
 %%JYTHON_DIR%%/Lib/encodings/mac_iceland.py
 %%JYTHON_DIR%%/Lib/encodings/mac_latin2.py
 %%JYTHON_DIR%%/Lib/encodings/mac_roman.py
+%%JYTHON_DIR%%/Lib/encodings/mac_romanian.py
 %%JYTHON_DIR%%/Lib/encodings/mac_turkish.py
 %%JYTHON_DIR%%/Lib/encodings/mbcs.py
+%%JYTHON_DIR%%/Lib/encodings/palmos.py
+%%JYTHON_DIR%%/Lib/encodings/ptcp154.py
+%%JYTHON_DIR%%/Lib/encodings/punycode.py
 %%JYTHON_DIR%%/Lib/encodings/quopri_codec.py
 %%JYTHON_DIR%%/Lib/encodings/raw_unicode_escape.py
 %%JYTHON_DIR%%/Lib/encodings/rot_13.py
+%%JYTHON_DIR%%/Lib/encodings/shift_jis.py
+%%JYTHON_DIR%%/Lib/encodings/shift_jis_2004.py
+%%JYTHON_DIR%%/Lib/encodings/shift_jisx0213.py
+%%JYTHON_DIR%%/Lib/encodings/string_escape.py
+%%JYTHON_DIR%%/Lib/encodings/tis_620.py
 %%JYTHON_DIR%%/Lib/encodings/undefined.py
 %%JYTHON_DIR%%/Lib/encodings/unicode_escape.py
 %%JYTHON_DIR%%/Lib/encodings/unicode_internal.py
@@ -425,83 +592,121 @@ etc/jython.reg
 %%JYTHON_DIR%%/Lib/encodings/utf_16_le.py
 %%JYTHON_DIR%%/Lib/encodings/utf_7.py
 %%JYTHON_DIR%%/Lib/encodings/utf_8.py
+%%JYTHON_DIR%%/Lib/encodings/utf_8_sig.py
 %%JYTHON_DIR%%/Lib/encodings/uu_codec.py
 %%JYTHON_DIR%%/Lib/encodings/zlib_codec.py
+%%JYTHON_DIR%%/Lib/filecmp.py
 %%JYTHON_DIR%%/Lib/fileinput.py
 %%JYTHON_DIR%%/Lib/fnmatch.py
 %%JYTHON_DIR%%/Lib/formatter.py
 %%JYTHON_DIR%%/Lib/fpformat.py
 %%JYTHON_DIR%%/Lib/ftplib.py
+%%JYTHON_DIR%%/Lib/functools.py
 %%JYTHON_DIR%%/Lib/getopt.py
+%%JYTHON_DIR%%/Lib/getpass.py
+%%JYTHON_DIR%%/Lib/gettext.py
 %%JYTHON_DIR%%/Lib/glob.py
 %%JYTHON_DIR%%/Lib/gopherlib.py
+%%JYTHON_DIR%%/Lib/grp.py
 %%JYTHON_DIR%%/Lib/gzip.py
+%%JYTHON_DIR%%/Lib/hashlib.py
+%%JYTHON_DIR%%/Lib/heapq.py
 %%JYTHON_DIR%%/Lib/hmac.py
 %%JYTHON_DIR%%/Lib/htmlentitydefs.py
 %%JYTHON_DIR%%/Lib/htmllib.py
 %%JYTHON_DIR%%/Lib/httplib.py
+%%JYTHON_DIR%%/Lib/ihooks.py
 %%JYTHON_DIR%%/Lib/imaplib.py
 %%JYTHON_DIR%%/Lib/imghdr.py
 %%JYTHON_DIR%%/Lib/inspect.py
 %%JYTHON_DIR%%/Lib/isql.py
-%%JYTHON_DIR%%/Lib/javaos$py.class
-%%JYTHON_DIR%%/Lib/javaos.py
-%%JYTHON_DIR%%/Lib/javapath$py.class
 %%JYTHON_DIR%%/Lib/javapath.py
 %%JYTHON_DIR%%/Lib/javashell.py
-%%JYTHON_DIR%%/Lib/jreload.py
-%%JYTHON_DIR%%/Lib/jxxload_help/DiscardHelp.java
-%%JYTHON_DIR%%/Lib/jxxload_help/JavaLoaderFactory.java
-%%JYTHON_DIR%%/Lib/jxxload_help/PackageManager.java
-%%JYTHON_DIR%%/Lib/jxxload_help/PathVFS.java
-%%JYTHON_DIR%%/Lib/jxxload_help/PathVFSJavaLoader.java
 %%JYTHON_DIR%%/Lib/keyword.py
 %%JYTHON_DIR%%/Lib/linecache.py
+%%JYTHON_DIR%%/Lib/locale.py
+%%JYTHON_DIR%%/Lib/logging/__init__.py
+%%JYTHON_DIR%%/Lib/logging/config.py
+%%JYTHON_DIR%%/Lib/logging/handlers.py
 %%JYTHON_DIR%%/Lib/macpath.py
 %%JYTHON_DIR%%/Lib/macurl2path.py
 %%JYTHON_DIR%%/Lib/mailbox.py
 %%JYTHON_DIR%%/Lib/mailcap.py
 %%JYTHON_DIR%%/Lib/markupbase.py
 %%JYTHON_DIR%%/Lib/marshal.py
+%%JYTHON_DIR%%/Lib/md5.py
 %%JYTHON_DIR%%/Lib/mhlib.py
 %%JYTHON_DIR%%/Lib/mimetools.py
 %%JYTHON_DIR%%/Lib/mimetypes.py
 %%JYTHON_DIR%%/Lib/mimify.py
+%%JYTHON_DIR%%/Lib/modjy/__init__.py
+%%JYTHON_DIR%%/Lib/modjy/modjy.py
+%%JYTHON_DIR%%/Lib/modjy/modjy_exceptions.py
+%%JYTHON_DIR%%/Lib/modjy/modjy_impl.py
+%%JYTHON_DIR%%/Lib/modjy/modjy_log.py
+%%JYTHON_DIR%%/Lib/modjy/modjy_params.py
+%%JYTHON_DIR%%/Lib/modjy/modjy_publish.py
+%%JYTHON_DIR%%/Lib/modjy/modjy_response.py
+%%JYTHON_DIR%%/Lib/modjy/modjy_write.py
+%%JYTHON_DIR%%/Lib/modjy/modjy_wsgi.py
+%%JYTHON_DIR%%/Lib/modulefinder.py
 %%JYTHON_DIR%%/Lib/multifile.py
 %%JYTHON_DIR%%/Lib/mutex.py
 %%JYTHON_DIR%%/Lib/netrc.py
+%%JYTHON_DIR%%/Lib/new.py
 %%JYTHON_DIR%%/Lib/nntplib.py
 %%JYTHON_DIR%%/Lib/ntpath.py
 %%JYTHON_DIR%%/Lib/nturl2path.py
+%%JYTHON_DIR%%/Lib/opcode.py
+%%JYTHON_DIR%%/Lib/optparse.py
+%%JYTHON_DIR%%/Lib/os$py.class
+%%JYTHON_DIR%%/Lib/os.py
 %%JYTHON_DIR%%/Lib/pawt/__init__.py
 %%JYTHON_DIR%%/Lib/pawt/colors.py
 %%JYTHON_DIR%%/Lib/pawt/swing.py
 %%JYTHON_DIR%%/Lib/pdb.py
 %%JYTHON_DIR%%/Lib/pickle.py
+%%JYTHON_DIR%%/Lib/pickletools.py
 %%JYTHON_DIR%%/Lib/pipes.py
+%%JYTHON_DIR%%/Lib/pkgutil.py
+%%JYTHON_DIR%%/Lib/platform.py
 %%JYTHON_DIR%%/Lib/popen2.py
 %%JYTHON_DIR%%/Lib/poplib.py
+%%JYTHON_DIR%%/Lib/posix.py
 %%JYTHON_DIR%%/Lib/posixfile.py
+%%JYTHON_DIR%%/Lib/posixpath$py.class
 %%JYTHON_DIR%%/Lib/posixpath.py
 %%JYTHON_DIR%%/Lib/pprint.py
 %%JYTHON_DIR%%/Lib/profile.py
 %%JYTHON_DIR%%/Lib/pstats.py
+%%JYTHON_DIR%%/Lib/pwd.py
+%%JYTHON_DIR%%/Lib/py_compile.py
+%%JYTHON_DIR%%/Lib/pycimport.py
 %%JYTHON_DIR%%/Lib/pyclbr.py
+%%JYTHON_DIR%%/Lib/pydoc.py
+%%JYTHON_DIR%%/Lib/pyexpat.py
 %%JYTHON_DIR%%/Lib/quopri.py
 %%JYTHON_DIR%%/Lib/random.py
 %%JYTHON_DIR%%/Lib/re.py
-%%JYTHON_DIR%%/Lib/reconvert.py
+%%JYTHON_DIR%%/Lib/readline.py
 %%JYTHON_DIR%%/Lib/repr.py
 %%JYTHON_DIR%%/Lib/rfc822.py
+%%JYTHON_DIR%%/Lib/rlcompleter.py
+%%JYTHON_DIR%%/Lib/robotparser.py
+%%JYTHON_DIR%%/Lib/runpy.py
 %%JYTHON_DIR%%/Lib/sched.py
 %%JYTHON_DIR%%/Lib/select.py
-%%JYTHON_DIR%%/Lib/setsfactory.py
+%%JYTHON_DIR%%/Lib/sets.py
 %%JYTHON_DIR%%/Lib/sgmllib.py
+%%JYTHON_DIR%%/Lib/sha.py
 %%JYTHON_DIR%%/Lib/shelve.py
 %%JYTHON_DIR%%/Lib/shlex.py
 %%JYTHON_DIR%%/Lib/shutil.py
+%%JYTHON_DIR%%/Lib/signal.py
 %%JYTHON_DIR%%/Lib/site$py.class
+%%JYTHON_DIR%%/Lib/site-packages/README
 %%JYTHON_DIR%%/Lib/site.py
+%%JYTHON_DIR%%/Lib/smtpd.py
 %%JYTHON_DIR%%/Lib/smtplib.py
 %%JYTHON_DIR%%/Lib/sndhdr.py
 %%JYTHON_DIR%%/Lib/socket.py
@@ -511,23 +716,36 @@ etc/jython.reg
 %%JYTHON_DIR%%/Lib/sre_parse.py
 %%JYTHON_DIR%%/Lib/stat$py.class
 %%JYTHON_DIR%%/Lib/stat.py
-%%JYTHON_DIR%%/Lib/string$py.class
 %%JYTHON_DIR%%/Lib/string.py
+%%JYTHON_DIR%%/Lib/subprocess.py
 %%JYTHON_DIR%%/Lib/symbol.py
+%%JYTHON_DIR%%/Lib/tabnanny.py
+%%JYTHON_DIR%%/Lib/tarfile.py
 %%JYTHON_DIR%%/Lib/telnetlib.py
 %%JYTHON_DIR%%/Lib/tempfile.py
+%%JYTHON_DIR%%/Lib/test/185test.db
 %%JYTHON_DIR%%/Lib/test/Graph.py
 %%JYTHON_DIR%%/Lib/test/README
 %%JYTHON_DIR%%/Lib/test/__init__.py
+%%JYTHON_DIR%%/Lib/test/access_protected_class.py
+%%JYTHON_DIR%%/Lib/test/access_protected_field.py
+%%JYTHON_DIR%%/Lib/test/anygui.py
 %%JYTHON_DIR%%/Lib/test/audiotest.au
 %%JYTHON_DIR%%/Lib/test/autotest.py
+%%JYTHON_DIR%%/Lib/test/bad_coding.py
+%%JYTHON_DIR%%/Lib/test/bad_coding2.py
+%%JYTHON_DIR%%/Lib/test/badsyntax_eof1.py
 %%JYTHON_DIR%%/Lib/test/badsyntax_future3.py
 %%JYTHON_DIR%%/Lib/test/badsyntax_future4.py
 %%JYTHON_DIR%%/Lib/test/badsyntax_future5.py
 %%JYTHON_DIR%%/Lib/test/badsyntax_future6.py
 %%JYTHON_DIR%%/Lib/test/badsyntax_future7.py
+%%JYTHON_DIR%%/Lib/test/badsyntax_future8.py
+%%JYTHON_DIR%%/Lib/test/badsyntax_future9.py
 %%JYTHON_DIR%%/Lib/test/badsyntax_nocaret.py
 %%JYTHON_DIR%%/Lib/test/blob.jar
+%%JYTHON_DIR%%/Lib/test/bug1126/bug1126.jar
+%%JYTHON_DIR%%/Lib/test/bug1239.jar
 %%JYTHON_DIR%%/Lib/test/bugs/bugs100.py
 %%JYTHON_DIR%%/Lib/test/bugs/bugs101.py
 %%JYTHON_DIR%%/Lib/test/bugs/jdkbugs.py
@@ -562,59 +780,207 @@ etc/jython.reg
 %%JYTHON_DIR%%/Lib/test/bugs/pr239.py
 %%JYTHON_DIR%%/Lib/test/bugs/pr241.py
 %%JYTHON_DIR%%/Lib/test/bugs/pr242.py
-%%JYTHON_DIR%%/Lib/test/data/PyBanner048.gif
-%%JYTHON_DIR%%/Lib/test/data/msg_01.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_02.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_03.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_04.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_05.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_06.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_07.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_08.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_09.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_10.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_11.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_12.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_13.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_14.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_15.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_16.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_17.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_18.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_19.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_20.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_21.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_22.txt
-%%JYTHON_DIR%%/Lib/test/data/msg_23.txt
+%%JYTHON_DIR%%/Lib/test/call_overridden_method.py
+%%JYTHON_DIR%%/Lib/test/call_protected_method.py
+%%JYTHON_DIR%%/Lib/test/cfgparser.1
+%%JYTHON_DIR%%/Lib/test/check_for_initializer_in_syspath.py
+%%JYTHON_DIR%%/Lib/test/check_soundcard.vbs
+%%JYTHON_DIR%%/Lib/test/cjkencodings_test.py
+%%JYTHON_DIR%%/Lib/test/classimport.jar
+%%JYTHON_DIR%%/Lib/test/classimport_Lib.jar
+%%JYTHON_DIR%%/Lib/test/crashers/README
+%%JYTHON_DIR%%/Lib/test/crashers/bogus_code_obj.py
+%%JYTHON_DIR%%/Lib/test/crashers/borrowed_ref_1.py
+%%JYTHON_DIR%%/Lib/test/crashers/borrowed_ref_2.py
+%%JYTHON_DIR%%/Lib/test/crashers/gc_inspection.py
+%%JYTHON_DIR%%/Lib/test/crashers/infinite_rec_1.py
+%%JYTHON_DIR%%/Lib/test/crashers/infinite_rec_2.py
+%%JYTHON_DIR%%/Lib/test/crashers/infinite_rec_4.py
+%%JYTHON_DIR%%/Lib/test/crashers/infinite_rec_5.py
+%%JYTHON_DIR%%/Lib/test/crashers/loosing_dict_ref.py
+%%JYTHON_DIR%%/Lib/test/crashers/nasty_eq_vs_dict.py
+%%JYTHON_DIR%%/Lib/test/crashers/recursion_limit_too_high.py
+%%JYTHON_DIR%%/Lib/test/crashers/recursive_call.py
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/abs.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/add.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/and.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/base.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/clamp.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/class.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/compare.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/comparetotal.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/comparetotmag.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/copy.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/copyabs.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/copynegate.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/copysign.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddAbs.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddAdd.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddAnd.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddBase.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddCanonical.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddClass.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddCompare.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddCompareSig.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddCompareTotal.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddCompareTotalMag.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddCopy.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddCopyAbs.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddCopyNegate.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddCopySign.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddDivide.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddDivideInt.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddEncode.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddFMA.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddInvert.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddLogB.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddMax.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddMaxMag.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddMin.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddMinMag.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddMinus.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddMultiply.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddNextMinus.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddNextPlus.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddNextToward.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddOr.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddPlus.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddQuantize.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddReduce.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddRemainder.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddRemainderNear.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddRotate.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddSameQuantum.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddScaleB.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddShift.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddSubtract.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddToIntegral.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ddXor.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/decDouble.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/decQuad.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/decSingle.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/divide.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/divideint.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqAbs.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqAdd.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqAnd.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqBase.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqCanonical.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqClass.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqCompare.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqCompareSig.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqCompareTotal.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqCompareTotalMag.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqCopy.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqCopyAbs.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqCopyNegate.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqCopySign.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqDivide.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqDivideInt.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqEncode.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqFMA.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqInvert.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqLogB.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqMax.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqMaxMag.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqMin.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqMinMag.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqMinus.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqMultiply.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqNextMinus.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqNextPlus.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqNextToward.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqOr.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqPlus.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqQuantize.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqReduce.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqRemainder.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqRemainderNear.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqRotate.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqSameQuantum.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqScaleB.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqShift.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqSubtract.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqToIntegral.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dqXor.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dsBase.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/dsEncode.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/exp.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/extra.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/fma.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/inexact.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/invert.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/ln.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/log10.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/logb.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/max.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/maxmag.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/min.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/minmag.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/minus.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/multiply.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/nextminus.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/nextplus.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/nexttoward.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/or.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/plus.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/power.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/powersqrt.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/quantize.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/randomBound32.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/randoms.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/reduce.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/remainder.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/remainderNear.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/rescale.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/rotate.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/rounding.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/samequantum.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/scaleb.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/shift.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/squareroot.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/subtract.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/testall.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/tointegral.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/tointegralx.decTest
+%%JYTHON_DIR%%/Lib/test/decimaltestdata/xor.decTest
+%%JYTHON_DIR%%/Lib/test/doctest_aliases.py
 %%JYTHON_DIR%%/Lib/test/double_const.py
+%%JYTHON_DIR%%/Lib/test/empty.vbs
+%%JYTHON_DIR%%/Lib/test/eof_fodder1.py
+%%JYTHON_DIR%%/Lib/test/eof_fodder2.py
+%%JYTHON_DIR%%/Lib/test/eof_fodder3.py
+%%JYTHON_DIR%%/Lib/test/eof_fodder4.py
+%%JYTHON_DIR%%/Lib/test/eof_fodder5.py
+%%JYTHON_DIR%%/Lib/test/eof_fodder6.py
+%%JYTHON_DIR%%/Lib/test/except_in_raising_code.py
+%%JYTHON_DIR%%/Lib/test/exception_hierarchy.txt
+%%JYTHON_DIR%%/Lib/test/fork_wait.py
 %%JYTHON_DIR%%/Lib/test/greyrgb.uue
-%%JYTHON_DIR%%/Lib/test/javatests/AnonInner.java
-%%JYTHON_DIR%%/Lib/test/javatests/Foo.java
-%%JYTHON_DIR%%/Lib/test/javatests/JOverload.java
-%%JYTHON_DIR%%/Lib/test/javatests/ListTest.java
-%%JYTHON_DIR%%/Lib/test/javatests/SubFoo.java
-%%JYTHON_DIR%%/Lib/test/javatests/TestSupport.java
-%%JYTHON_DIR%%/Lib/test/javatests/__init__.py
+%%JYTHON_DIR%%/Lib/test/import_nonexistent.py
+%%JYTHON_DIR%%/Lib/test/import_star_from_java.py
+%%JYTHON_DIR%%/Lib/test/infinite_reload.py
+%%JYTHON_DIR%%/Lib/test/inspect_fodder.py
+%%JYTHON_DIR%%/Lib/test/inspect_fodder2.py
+%%JYTHON_DIR%%/Lib/test/invalid_utf_8_declared_encoding.py
 %%JYTHON_DIR%%/Lib/test/jser2_classes.py
+%%JYTHON_DIR%%/Lib/test/junit_xml.py
+%%JYTHON_DIR%%/Lib/test/latin1_no_encoding.py
+%%JYTHON_DIR%%/Lib/test/leakers/README.txt
+%%JYTHON_DIR%%/Lib/test/leakers/__init__.py
+%%JYTHON_DIR%%/Lib/test/leakers/test_ctypes.py
+%%JYTHON_DIR%%/Lib/test/leakers/test_gestalt.py
+%%JYTHON_DIR%%/Lib/test/leakers/test_selftype.py
+%%JYTHON_DIR%%/Lib/test/list_tests.py
+%%JYTHON_DIR%%/Lib/test/mapping_tests.py
+%%JYTHON_DIR%%/Lib/test/module_deleter.py
 %%JYTHON_DIR%%/Lib/test/output/test_MimeWriter
-%%JYTHON_DIR%%/Lib/test/output/test_array
-%%JYTHON_DIR%%/Lib/test/output/test_asynchat
-%%JYTHON_DIR%%/Lib/test/output/test_augassign
-%%JYTHON_DIR%%/Lib/test/output/test_binascii
-%%JYTHON_DIR%%/Lib/test/output/test_builtin
-%%JYTHON_DIR%%/Lib/test/output/test_cfgparser
+%%JYTHON_DIR%%/Lib/test/output/test_cProfile
 %%JYTHON_DIR%%/Lib/test/output/test_cgi
-%%JYTHON_DIR%%/Lib/test/output/test_charmapcodec
 %%JYTHON_DIR%%/Lib/test/output/test_class
-%%JYTHON_DIR%%/Lib/test/output/test_coercion
-%%JYTHON_DIR%%/Lib/test/output/test_compare
-%%JYTHON_DIR%%/Lib/test/output/test_compile
 %%JYTHON_DIR%%/Lib/test/output/test_cookie
-%%JYTHON_DIR%%/Lib/test/output/test_exceptions
 %%JYTHON_DIR%%/Lib/test/output/test_extcall
 %%JYTHON_DIR%%/Lib/test/output/test_frozen
-%%JYTHON_DIR%%/Lib/test/output/test_future
-%%JYTHON_DIR%%/Lib/test/output/test_gettext
 %%JYTHON_DIR%%/Lib/test/output/test_global
 %%JYTHON_DIR%%/Lib/test/output/test_grammar
 %%JYTHON_DIR%%/Lib/test/output/test_httplib
@@ -624,82 +990,104 @@ etc/jython.reg
 %%JYTHON_DIR%%/Lib/test/output/test_jser
 %%JYTHON_DIR%%/Lib/test/output/test_jsubclass
 %%JYTHON_DIR%%/Lib/test/output/test_linuxaudiodev
-%%JYTHON_DIR%%/Lib/test/output/test_longexp
+%%JYTHON_DIR%%/Lib/test/output/test_logging
 %%JYTHON_DIR%%/Lib/test/output/test_math
-%%JYTHON_DIR%%/Lib/test/output/test_md5
 %%JYTHON_DIR%%/Lib/test/output/test_methods
-%%JYTHON_DIR%%/Lib/test/output/test_mimetools
 %%JYTHON_DIR%%/Lib/test/output/test_mmap
 %%JYTHON_DIR%%/Lib/test/output/test_new
 %%JYTHON_DIR%%/Lib/test/output/test_nis
 %%JYTHON_DIR%%/Lib/test/output/test_opcodes
 %%JYTHON_DIR%%/Lib/test/output/test_openpty
 %%JYTHON_DIR%%/Lib/test/output/test_operations
+%%JYTHON_DIR%%/Lib/test/output/test_ossaudiodev
+%%JYTHON_DIR%%/Lib/test/output/test_pep277
 %%JYTHON_DIR%%/Lib/test/output/test_pkg
 %%JYTHON_DIR%%/Lib/test/output/test_poll
+%%JYTHON_DIR%%/Lib/test/output/test_popen
 %%JYTHON_DIR%%/Lib/test/output/test_popen2
-%%JYTHON_DIR%%/Lib/test/output/test_posixpath
-%%JYTHON_DIR%%/Lib/test/output/test_pow
 %%JYTHON_DIR%%/Lib/test/output/test_profile
 %%JYTHON_DIR%%/Lib/test/output/test_pty
-%%JYTHON_DIR%%/Lib/test/output/test_pwd
 %%JYTHON_DIR%%/Lib/test/output/test_pyexpat
-%%JYTHON_DIR%%/Lib/test/output/test_re
 %%JYTHON_DIR%%/Lib/test/output/test_regex
 %%JYTHON_DIR%%/Lib/test/output/test_rgbimg
-%%JYTHON_DIR%%/Lib/test/output/test_richcmp
-%%JYTHON_DIR%%/Lib/test/output/test_rotor
 %%JYTHON_DIR%%/Lib/test/output/test_scope
 %%JYTHON_DIR%%/Lib/test/output/test_signal
-%%JYTHON_DIR%%/Lib/test/output/test_string
 %%JYTHON_DIR%%/Lib/test/output/test_thread
 %%JYTHON_DIR%%/Lib/test/output/test_threadedtempfile
-%%JYTHON_DIR%%/Lib/test/output/test_time
 %%JYTHON_DIR%%/Lib/test/output/test_tokenize
 %%JYTHON_DIR%%/Lib/test/output/test_types
-%%JYTHON_DIR%%/Lib/test/output/test_ucn
-%%JYTHON_DIR%%/Lib/test/output/test_unicode
-%%JYTHON_DIR%%/Lib/test/output/test_unicode_file
-%%JYTHON_DIR%%/Lib/test/output/test_unicodedata
-%%JYTHON_DIR%%/Lib/test/output/test_unpack
-%%JYTHON_DIR%%/Lib/test/output/test_urlparse
+%%JYTHON_DIR%%/Lib/test/output/test_types_pyc
 %%JYTHON_DIR%%/Lib/test/output/test_winreg
-%%JYTHON_DIR%%/Lib/test/output/test_winsound
-%%JYTHON_DIR%%/Lib/test/output/test_xreadline
+%%JYTHON_DIR%%/Lib/test/output/test_xdrlib
+%%JYTHON_DIR%%/Lib/test/output/xmltests
+%%JYTHON_DIR%%/Lib/test/outstanding_bugs.py
+%%JYTHON_DIR%%/Lib/test/pbcvm/test/README
+%%JYTHON_DIR%%/Lib/test/pbcvm/test/__init__.py
+%%JYTHON_DIR%%/Lib/test/pbcvm/test/test_builtin_pyc.pyc
+%%JYTHON_DIR%%/Lib/test/pbcvm/test/test_exceptions_pyc.pyc
+%%JYTHON_DIR%%/Lib/test/pbcvm/test/test_types_pyc.pyc
 %%JYTHON_DIR%%/Lib/test/pickletester.py
+%%JYTHON_DIR%%/Lib/test/print_sans_lib.py
+%%JYTHON_DIR%%/Lib/test/pyclbr_input.py
 %%JYTHON_DIR%%/Lib/test/pydocfodder.py
+%%JYTHON_DIR%%/Lib/test/pyservlet/__init__.py
+%%JYTHON_DIR%%/Lib/test/pyservlet/basic.py
+%%JYTHON_DIR%%/Lib/test/pyservlet/empty.py
+%%JYTHON_DIR%%/Lib/test/pyservlet/filter.py
+%%JYTHON_DIR%%/Lib/test/pyservlet/increment.py
+%%JYTHON_DIR%%/Lib/test/pyservlet/updated_basic.py
 %%JYTHON_DIR%%/Lib/test/pystone.py
+%%JYTHON_DIR%%/Lib/test/python_home.policy
 %%JYTHON_DIR%%/Lib/test/re_tests.py
 %%JYTHON_DIR%%/Lib/test/regex_tests.py
 %%JYTHON_DIR%%/Lib/test/regrtest.py
 %%JYTHON_DIR%%/Lib/test/reperf.py
+%%JYTHON_DIR%%/Lib/test/sample_doctest.py
+%%JYTHON_DIR%%/Lib/test/seq_tests.py
+%%JYTHON_DIR%%/Lib/test/sgml_input.html
 %%JYTHON_DIR%%/Lib/test/sortperf.py
 %%JYTHON_DIR%%/Lib/test/string_tests.py
+%%JYTHON_DIR%%/Lib/test/sys_jy_test_module.py
+%%JYTHON_DIR%%/Lib/test/syspath_import.jar
 %%JYTHON_DIR%%/Lib/test/test.xml
 %%JYTHON_DIR%%/Lib/test/test.xml.out
 %%JYTHON_DIR%%/Lib/test/test_MimeWriter.py
 %%JYTHON_DIR%%/Lib/test/test_SimpleXMLRPCServer.py
 %%JYTHON_DIR%%/Lib/test/test_StringIO.py
+%%JYTHON_DIR%%/Lib/test/test_StringIO_jy.py
 %%JYTHON_DIR%%/Lib/test/test___all__.py
 %%JYTHON_DIR%%/Lib/test/test___future__.py
+%%JYTHON_DIR%%/Lib/test/test__locale.py
+%%JYTHON_DIR%%/Lib/test/test__rawffi.py
+%%JYTHON_DIR%%/Lib/test/test_aepack.py
 %%JYTHON_DIR%%/Lib/test/test_al.py
+%%JYTHON_DIR%%/Lib/test/test_anydbm.py
+%%JYTHON_DIR%%/Lib/test/test_applesingle.py
 %%JYTHON_DIR%%/Lib/test/test_array.py
+%%JYTHON_DIR%%/Lib/test/test_array_jy.py
+%%JYTHON_DIR%%/Lib/test/test_ast.py
+%%JYTHON_DIR%%/Lib/test/test_ast_jy.py
 %%JYTHON_DIR%%/Lib/test/test_asynchat.py
 %%JYTHON_DIR%%/Lib/test/test_atexit.py
 %%JYTHON_DIR%%/Lib/test/test_audioop.py
 %%JYTHON_DIR%%/Lib/test/test_augassign.py
-%%JYTHON_DIR%%/Lib/test/test_b1.py
-%%JYTHON_DIR%%/Lib/test/test_b2.py
 %%JYTHON_DIR%%/Lib/test/test_base64.py
 %%JYTHON_DIR%%/Lib/test/test_bastion.py
+%%JYTHON_DIR%%/Lib/test/test_bigaddrspace.py
+%%JYTHON_DIR%%/Lib/test/test_bigmem.py
 %%JYTHON_DIR%%/Lib/test/test_binascii.py
 %%JYTHON_DIR%%/Lib/test/test_binhex.py
 %%JYTHON_DIR%%/Lib/test/test_binop.py
 %%JYTHON_DIR%%/Lib/test/test_bisect.py
+%%JYTHON_DIR%%/Lib/test/test_bool.py
 %%JYTHON_DIR%%/Lib/test/test_bsddb.py
+%%JYTHON_DIR%%/Lib/test/test_bsddb185.py
+%%JYTHON_DIR%%/Lib/test/test_bsddb3.py
 %%JYTHON_DIR%%/Lib/test/test_bufio.py
-%%JYTHON_DIR%%/Lib/test/test_bugfixes.py
 %%JYTHON_DIR%%/Lib/test/test_builtin.py
+%%JYTHON_DIR%%/Lib/test/test_builtin_jy.py
+%%JYTHON_DIR%%/Lib/test/test_bz2.py
+%%JYTHON_DIR%%/Lib/test/test_cProfile.py
 %%JYTHON_DIR%%/Lib/test/test_calendar.py
 %%JYTHON_DIR%%/Lib/test/test_call.py
 %%JYTHON_DIR%%/Lib/test/test_capi.py
@@ -707,48 +1095,118 @@ etc/jython.reg
 %%JYTHON_DIR%%/Lib/test/test_cfgparser.py
 %%JYTHON_DIR%%/Lib/test/test_cgi.py
 %%JYTHON_DIR%%/Lib/test/test_charmapcodec.py
+%%JYTHON_DIR%%/Lib/test/test_chdir.py
 %%JYTHON_DIR%%/Lib/test/test_cl.py
 %%JYTHON_DIR%%/Lib/test/test_class.py
+%%JYTHON_DIR%%/Lib/test/test_class_jy.py
+%%JYTHON_DIR%%/Lib/test/test_classdecorators.py
+%%JYTHON_DIR%%/Lib/test/test_classpathimporter.py
+%%JYTHON_DIR%%/Lib/test/test_closuregen.py
 %%JYTHON_DIR%%/Lib/test/test_cmath.py
+%%JYTHON_DIR%%/Lib/test/test_cmath_jy.py
+%%JYTHON_DIR%%/Lib/test/test_cmd_line.py
+%%JYTHON_DIR%%/Lib/test/test_cmp_jy.py
+%%JYTHON_DIR%%/Lib/test/test_code.py
+%%JYTHON_DIR%%/Lib/test/test_codeccallbacks.py
+%%JYTHON_DIR%%/Lib/test/test_codecencodings_cn.py
+%%JYTHON_DIR%%/Lib/test/test_codecencodings_hk.py
+%%JYTHON_DIR%%/Lib/test/test_codecencodings_jp.py
+%%JYTHON_DIR%%/Lib/test/test_codecencodings_kr.py
+%%JYTHON_DIR%%/Lib/test/test_codecencodings_tw.py
+%%JYTHON_DIR%%/Lib/test/test_codecmaps_cn.py
+%%JYTHON_DIR%%/Lib/test/test_codecmaps_hk.py
+%%JYTHON_DIR%%/Lib/test/test_codecmaps_jp.py
+%%JYTHON_DIR%%/Lib/test/test_codecmaps_kr.py
+%%JYTHON_DIR%%/Lib/test/test_codecmaps_tw.py
 %%JYTHON_DIR%%/Lib/test/test_codecs.py
+%%JYTHON_DIR%%/Lib/test/test_codecs_jy.py
 %%JYTHON_DIR%%/Lib/test/test_codeop.py
+%%JYTHON_DIR%%/Lib/test/test_codeop_jy.py
+%%JYTHON_DIR%%/Lib/test/test_coding.py
+%%JYTHON_DIR%%/Lib/test/test_coerce_jy.py
 %%JYTHON_DIR%%/Lib/test/test_coercion.py
+%%JYTHON_DIR%%/Lib/test/test_colorsys.py
 %%JYTHON_DIR%%/Lib/test/test_commands.py
 %%JYTHON_DIR%%/Lib/test/test_compare.py
 %%JYTHON_DIR%%/Lib/test/test_compile.py
+%%JYTHON_DIR%%/Lib/test/test_compile_jy.py
+%%JYTHON_DIR%%/Lib/test/test_compiler.py
 %%JYTHON_DIR%%/Lib/test/test_complex.py
+%%JYTHON_DIR%%/Lib/test/test_complex_args.py
+%%JYTHON_DIR%%/Lib/test/test_complex_jy.py
+%%JYTHON_DIR%%/Lib/test/test_concat_jy.py
 %%JYTHON_DIR%%/Lib/test/test_contains.py
+%%JYTHON_DIR%%/Lib/test/test_contextlib.py
 %%JYTHON_DIR%%/Lib/test/test_cookie.py
+%%JYTHON_DIR%%/Lib/test/test_cookielib.py
+%%JYTHON_DIR%%/Lib/test/test_copy.py
 %%JYTHON_DIR%%/Lib/test/test_copy_reg.py
 %%JYTHON_DIR%%/Lib/test/test_cpickle.py
+%%JYTHON_DIR%%/Lib/test/test_cpickle_jy.py
 %%JYTHON_DIR%%/Lib/test/test_crypt.py
+%%JYTHON_DIR%%/Lib/test/test_csv.py
+%%JYTHON_DIR%%/Lib/test/test_ctypes.py
 %%JYTHON_DIR%%/Lib/test/test_curses.py
 %%JYTHON_DIR%%/Lib/test/test_datetime.py
 %%JYTHON_DIR%%/Lib/test/test_dbm.py
+%%JYTHON_DIR%%/Lib/test/test_decimal.py
+%%JYTHON_DIR%%/Lib/test/test_decorators.py
+%%JYTHON_DIR%%/Lib/test/test_decorators_jy.py
+%%JYTHON_DIR%%/Lib/test/test_defaultdict.py
+%%JYTHON_DIR%%/Lib/test/test_deque.py
 %%JYTHON_DIR%%/Lib/test/test_descr.py
+%%JYTHON_DIR%%/Lib/test/test_descr_jy.py
 %%JYTHON_DIR%%/Lib/test/test_descrtut.py
+%%JYTHON_DIR%%/Lib/test/test_dict.py
+%%JYTHON_DIR%%/Lib/test/test_dict2java.py
+%%JYTHON_DIR%%/Lib/test/test_dict_jy.py
+%%JYTHON_DIR%%/Lib/test/test_dictproxy_jy.py
 %%JYTHON_DIR%%/Lib/test/test_difflib.py
+%%JYTHON_DIR%%/Lib/test/test_difflib_expect.html
 %%JYTHON_DIR%%/Lib/test/test_dircache.py
+%%JYTHON_DIR%%/Lib/test/test_dis.py
+%%JYTHON_DIR%%/Lib/test/test_distutils.py
 %%JYTHON_DIR%%/Lib/test/test_dl.py
 %%JYTHON_DIR%%/Lib/test/test_doctest.py
+%%JYTHON_DIR%%/Lib/test/test_doctest.txt
 %%JYTHON_DIR%%/Lib/test/test_doctest2.py
-%%JYTHON_DIR%%/Lib/test/test_dospath.py
+%%JYTHON_DIR%%/Lib/test/test_doctest2.txt
+%%JYTHON_DIR%%/Lib/test/test_doctest3.txt
+%%JYTHON_DIR%%/Lib/test/test_doctest4.txt
 %%JYTHON_DIR%%/Lib/test/test_dumbdbm.py
+%%JYTHON_DIR%%/Lib/test/test_dummy_thread.py
+%%JYTHON_DIR%%/Lib/test/test_dummy_threading.py
 %%JYTHON_DIR%%/Lib/test/test_email.py
 %%JYTHON_DIR%%/Lib/test/test_email_codecs.py
+%%JYTHON_DIR%%/Lib/test/test_email_renamed.py
 %%JYTHON_DIR%%/Lib/test/test_enumerate.py
+%%JYTHON_DIR%%/Lib/test/test_eof.py
+%%JYTHON_DIR%%/Lib/test/test_eof_jy.py
 %%JYTHON_DIR%%/Lib/test/test_errno.py
+%%JYTHON_DIR%%/Lib/test/test_evalorder.py
+%%JYTHON_DIR%%/Lib/test/test_exception_variations.py
 %%JYTHON_DIR%%/Lib/test/test_exceptions.py
+%%JYTHON_DIR%%/Lib/test/test_exceptions_jy.py
 %%JYTHON_DIR%%/Lib/test/test_extcall.py
 %%JYTHON_DIR%%/Lib/test/test_fcntl.py
 %%JYTHON_DIR%%/Lib/test/test_file.py
+%%JYTHON_DIR%%/Lib/test/test_file_jy.py
+%%JYTHON_DIR%%/Lib/test/test_file_newlines.py
+%%JYTHON_DIR%%/Lib/test/test_filecmp.py
 %%JYTHON_DIR%%/Lib/test/test_fileinput.py
+%%JYTHON_DIR%%/Lib/test/test_fileno.py
+%%JYTHON_DIR%%/Lib/test/test_float.py
+%%JYTHON_DIR%%/Lib/test/test_float_jy.py
 %%JYTHON_DIR%%/Lib/test/test_fnmatch.py
 %%JYTHON_DIR%%/Lib/test/test_fork1.py
 %%JYTHON_DIR%%/Lib/test/test_format.py
+%%JYTHON_DIR%%/Lib/test/test_format_jy.py
 %%JYTHON_DIR%%/Lib/test/test_fpformat.py
 %%JYTHON_DIR%%/Lib/test/test_frozen.py
+%%JYTHON_DIR%%/Lib/test/test_func_jy.py
+%%JYTHON_DIR%%/Lib/test/test_func_syntax_jy.py
 %%JYTHON_DIR%%/Lib/test/test_funcattrs.py
+%%JYTHON_DIR%%/Lib/test/test_functools.py
 %%JYTHON_DIR%%/Lib/test/test_future.py
 %%JYTHON_DIR%%/Lib/test/test_future1.py
 %%JYTHON_DIR%%/Lib/test/test_future2.py
@@ -756,49 +1214,83 @@ etc/jython.reg
 %%JYTHON_DIR%%/Lib/test/test_gc.py
 %%JYTHON_DIR%%/Lib/test/test_gdbm.py
 %%JYTHON_DIR%%/Lib/test/test_generators.py
+%%JYTHON_DIR%%/Lib/test/test_genexps.py
+%%JYTHON_DIR%%/Lib/test/test_genexps_jy.py
 %%JYTHON_DIR%%/Lib/test/test_getargs.py
+%%JYTHON_DIR%%/Lib/test/test_getargs2.py
 %%JYTHON_DIR%%/Lib/test/test_getopt.py
 %%JYTHON_DIR%%/Lib/test/test_gettext.py
 %%JYTHON_DIR%%/Lib/test/test_gl.py
 %%JYTHON_DIR%%/Lib/test/test_glob.py
 %%JYTHON_DIR%%/Lib/test/test_global.py
 %%JYTHON_DIR%%/Lib/test/test_grammar.py
+%%JYTHON_DIR%%/Lib/test/test_grammar_jy.py
 %%JYTHON_DIR%%/Lib/test/test_grp.py
 %%JYTHON_DIR%%/Lib/test/test_gzip.py
 %%JYTHON_DIR%%/Lib/test/test_hash.py
+%%JYTHON_DIR%%/Lib/test/test_hashlib.py
+%%JYTHON_DIR%%/Lib/test/test_hashlib_jy.py
+%%JYTHON_DIR%%/Lib/test/test_heapq.py
+%%JYTHON_DIR%%/Lib/test/test_hexoct.py
 %%JYTHON_DIR%%/Lib/test/test_hmac.py
 %%JYTHON_DIR%%/Lib/test/test_hotshot.py
 %%JYTHON_DIR%%/Lib/test/test_htmllib.py
 %%JYTHON_DIR%%/Lib/test/test_htmlparser.py
 %%JYTHON_DIR%%/Lib/test/test_httplib.py
 %%JYTHON_DIR%%/Lib/test/test_imageop.py
+%%JYTHON_DIR%%/Lib/test/test_imaplib.py
 %%JYTHON_DIR%%/Lib/test/test_imgfile.py
+%%JYTHON_DIR%%/Lib/test/test_imp.py
 %%JYTHON_DIR%%/Lib/test/test_import.py
+%%JYTHON_DIR%%/Lib/test/test_import_jy.py
 %%JYTHON_DIR%%/Lib/test/test_importhooks.py
+%%JYTHON_DIR%%/Lib/test/test_index.py
 %%JYTHON_DIR%%/Lib/test/test_inspect.py
+%%JYTHON_DIR%%/Lib/test/test_int_jy.py
+%%JYTHON_DIR%%/Lib/test/test_ioctl.py
+%%JYTHON_DIR%%/Lib/test/test_isatty.py
+%%JYTHON_DIR%%/Lib/test/test_isinstance.py
 %%JYTHON_DIR%%/Lib/test/test_iter.py
+%%JYTHON_DIR%%/Lib/test/test_iter_jy.py
+%%JYTHON_DIR%%/Lib/test/test_iterlen.py
+%%JYTHON_DIR%%/Lib/test/test_itertools.py
 %%JYTHON_DIR%%/Lib/test/test_janoninner.py
+%%JYTHON_DIR%%/Lib/test/test_java_integration.py
+%%JYTHON_DIR%%/Lib/test/test_java_list_delegate.py
+%%JYTHON_DIR%%/Lib/test/test_java_subclasses.py
+%%JYTHON_DIR%%/Lib/test/test_java_visibility.py
 %%JYTHON_DIR%%/Lib/test/test_javalist.py
 %%JYTHON_DIR%%/Lib/test/test_javashell.py
 %%JYTHON_DIR%%/Lib/test/test_jbasic.py
 %%JYTHON_DIR%%/Lib/test/test_joverload.py
-%%JYTHON_DIR%%/Lib/test/test_jreload.py
 %%JYTHON_DIR%%/Lib/test/test_jser.py
 %%JYTHON_DIR%%/Lib/test/test_jser2.py
-%%JYTHON_DIR%%/Lib/test/test_jsubclass.py
-%%JYTHON_DIR%%/Lib/test/test_jy_compile.py
 %%JYTHON_DIR%%/Lib/test/test_jy_generators.py
 %%JYTHON_DIR%%/Lib/test/test_jy_internals.py
+%%JYTHON_DIR%%/Lib/test/test_jython_initializer.py
 %%JYTHON_DIR%%/Lib/test/test_largefile.py
 %%JYTHON_DIR%%/Lib/test/test_linuxaudiodev.py
+%%JYTHON_DIR%%/Lib/test/test_list.py
+%%JYTHON_DIR%%/Lib/test/test_list_jy.py
+%%JYTHON_DIR%%/Lib/test/test_listcomp_jy.py
 %%JYTHON_DIR%%/Lib/test/test_locale.py
+%%JYTHON_DIR%%/Lib/test/test_logging.py
 %%JYTHON_DIR%%/Lib/test/test_long.py
 %%JYTHON_DIR%%/Lib/test/test_long_future.py
+%%JYTHON_DIR%%/Lib/test/test_long_int_args.py
 %%JYTHON_DIR%%/Lib/test/test_longexp.py
+%%JYTHON_DIR%%/Lib/test/test_macfs.py
+%%JYTHON_DIR%%/Lib/test/test_macostools.py
+%%JYTHON_DIR%%/Lib/test/test_macpath.py
 %%JYTHON_DIR%%/Lib/test/test_mailbox.py
 %%JYTHON_DIR%%/Lib/test/test_marshal.py
 %%JYTHON_DIR%%/Lib/test/test_math.py
+%%JYTHON_DIR%%/Lib/test/test_math_jy.py
 %%JYTHON_DIR%%/Lib/test/test_md5.py
+%%JYTHON_DIR%%/Lib/test/test_metaclass.py
+%%JYTHON_DIR%%/Lib/test/test_metaclass_support/__init__.py
+%%JYTHON_DIR%%/Lib/test/test_metaclass_support/metaclass.py
+%%JYTHON_DIR%%/Lib/test/test_metaclass_support/simpleclass.py
 %%JYTHON_DIR%%/Lib/test/test_methods.py
 %%JYTHON_DIR%%/Lib/test/test_mhlib.py
 %%JYTHON_DIR%%/Lib/test/test_mimetools.py
@@ -806,24 +1298,43 @@ etc/jython.reg
 %%JYTHON_DIR%%/Lib/test/test_minidom.py
 %%JYTHON_DIR%%/Lib/test/test_mmap.py
 %%JYTHON_DIR%%/Lib/test/test_module.py
+%%JYTHON_DIR%%/Lib/test/test_multibytecodec.py
+%%JYTHON_DIR%%/Lib/test/test_multibytecodec_support.py
 %%JYTHON_DIR%%/Lib/test/test_multifile.py
 %%JYTHON_DIR%%/Lib/test/test_mutants.py
 %%JYTHON_DIR%%/Lib/test/test_netrc.py
 %%JYTHON_DIR%%/Lib/test/test_new.py
 %%JYTHON_DIR%%/Lib/test/test_nis.py
+%%JYTHON_DIR%%/Lib/test/test_normalization.py
+%%JYTHON_DIR%%/Lib/test/test_nt_paths_jy.py
 %%JYTHON_DIR%%/Lib/test/test_ntpath.py
+%%JYTHON_DIR%%/Lib/test/test_old_mailbox.py
 %%JYTHON_DIR%%/Lib/test/test_opcodes.py
 %%JYTHON_DIR%%/Lib/test/test_openpty.py
 %%JYTHON_DIR%%/Lib/test/test_operations.py
 %%JYTHON_DIR%%/Lib/test/test_operator.py
+%%JYTHON_DIR%%/Lib/test/test_optparse.py
 %%JYTHON_DIR%%/Lib/test/test_os.py
+%%JYTHON_DIR%%/Lib/test/test_ossaudiodev.py
 %%JYTHON_DIR%%/Lib/test/test_parser.py
+%%JYTHON_DIR%%/Lib/test/test_pbcvm.py
+%%JYTHON_DIR%%/Lib/test/test_peepholer.py
 %%JYTHON_DIR%%/Lib/test/test_pep247.py
+%%JYTHON_DIR%%/Lib/test/test_pep263.py
+%%JYTHON_DIR%%/Lib/test/test_pep263_jy.py
+%%JYTHON_DIR%%/Lib/test/test_pep277.py
+%%JYTHON_DIR%%/Lib/test/test_pep292.py
+%%JYTHON_DIR%%/Lib/test/test_pep352.py
 %%JYTHON_DIR%%/Lib/test/test_pickle.py
+%%JYTHON_DIR%%/Lib/test/test_pickletools.py
 %%JYTHON_DIR%%/Lib/test/test_pkg.py
 %%JYTHON_DIR%%/Lib/test/test_pkgimport.py
+%%JYTHON_DIR%%/Lib/test/test_platform.py
+%%JYTHON_DIR%%/Lib/test/test_plistlib.py
 %%JYTHON_DIR%%/Lib/test/test_poll.py
+%%JYTHON_DIR%%/Lib/test/test_popen.py
 %%JYTHON_DIR%%/Lib/test/test_popen2.py
+%%JYTHON_DIR%%/Lib/test/test_posix.py
 %%JYTHON_DIR%%/Lib/test/test_posixpath.py
 %%JYTHON_DIR%%/Lib/test/test_pow.py
 %%JYTHON_DIR%%/Lib/test/test_pprint.py
@@ -833,79 +1344,150 @@ etc/jython.reg
 %%JYTHON_DIR%%/Lib/test/test_pwd.py
 %%JYTHON_DIR%%/Lib/test/test_pyclbr.py
 %%JYTHON_DIR%%/Lib/test/test_pyexpat.py
+%%JYTHON_DIR%%/Lib/test/test_pythoninterpreter_jy.py
 %%JYTHON_DIR%%/Lib/test/test_queue.py
 %%JYTHON_DIR%%/Lib/test/test_quopri.py
 %%JYTHON_DIR%%/Lib/test/test_random.py
 %%JYTHON_DIR%%/Lib/test/test_re.py
-%%JYTHON_DIR%%/Lib/test/test_regex.py
+%%JYTHON_DIR%%/Lib/test/test_re_jy.py
 %%JYTHON_DIR%%/Lib/test/test_repr.py
+%%JYTHON_DIR%%/Lib/test/test_resource.py
 %%JYTHON_DIR%%/Lib/test/test_rfc822.py
 %%JYTHON_DIR%%/Lib/test/test_rgbimg.py
 %%JYTHON_DIR%%/Lib/test/test_richcmp.py
-%%JYTHON_DIR%%/Lib/test/test_rotor.py
+%%JYTHON_DIR%%/Lib/test/test_robotparser.py
+%%JYTHON_DIR%%/Lib/test/test_runpy.py
 %%JYTHON_DIR%%/Lib/test/test_sax.py
+%%JYTHON_DIR%%/Lib/test/test_sax_jy.py
 %%JYTHON_DIR%%/Lib/test/test_scope.py
+%%JYTHON_DIR%%/Lib/test/test_scriptpackages.py
 %%JYTHON_DIR%%/Lib/test/test_select.py
 %%JYTHON_DIR%%/Lib/test/test_select_new.py
+%%JYTHON_DIR%%/Lib/test/test_seq_jy.py
+%%JYTHON_DIR%%/Lib/test/test_set.py
+%%JYTHON_DIR%%/Lib/test/test_set_jy.py
 %%JYTHON_DIR%%/Lib/test/test_sets.py
 %%JYTHON_DIR%%/Lib/test/test_sgmllib.py
 %%JYTHON_DIR%%/Lib/test/test_sha.py
+%%JYTHON_DIR%%/Lib/test/test_shelve.py
+%%JYTHON_DIR%%/Lib/test/test_shlex.py
+%%JYTHON_DIR%%/Lib/test/test_shutil.py
 %%JYTHON_DIR%%/Lib/test/test_signal.py
+%%JYTHON_DIR%%/Lib/test/test_site.py
+%%JYTHON_DIR%%/Lib/test/test_slice.py
+%%JYTHON_DIR%%/Lib/test/test_slots_jy.py
 %%JYTHON_DIR%%/Lib/test/test_socket.py
 %%JYTHON_DIR%%/Lib/test/test_socket_ssl.py
 %%JYTHON_DIR%%/Lib/test/test_socketserver.py
-%%JYTHON_DIR%%/Lib/test/test_sre.py
+%%JYTHON_DIR%%/Lib/test/test_softspace.py
+%%JYTHON_DIR%%/Lib/test/test_sort.py
+%%JYTHON_DIR%%/Lib/test/test_sort_jy.py
+%%JYTHON_DIR%%/Lib/test/test_sqlite.py
+%%JYTHON_DIR%%/Lib/test/test_startfile.py
+%%JYTHON_DIR%%/Lib/test/test_str.py
 %%JYTHON_DIR%%/Lib/test/test_str2unicode.py
+%%JYTHON_DIR%%/Lib/test/test_str_jy.py
 %%JYTHON_DIR%%/Lib/test/test_strftime.py
 %%JYTHON_DIR%%/Lib/test/test_string.py
+%%JYTHON_DIR%%/Lib/test/test_stringmap.py
+%%JYTHON_DIR%%/Lib/test/test_stringprep.py
 %%JYTHON_DIR%%/Lib/test/test_strop.py
+%%JYTHON_DIR%%/Lib/test/test_strptime.py
 %%JYTHON_DIR%%/Lib/test/test_struct.py
+%%JYTHON_DIR%%/Lib/test/test_structmembers.py
 %%JYTHON_DIR%%/Lib/test/test_structseq.py
 %%JYTHON_DIR%%/Lib/test/test_subclasses.py
+%%JYTHON_DIR%%/Lib/test/test_subclasses_jy.py
+%%JYTHON_DIR%%/Lib/test/test_subprocess.py
+%%JYTHON_DIR%%/Lib/test/test_subprocess_jy.py
 %%JYTHON_DIR%%/Lib/test/test_sunaudiodev.py
 %%JYTHON_DIR%%/Lib/test/test_sundry.py
 %%JYTHON_DIR%%/Lib/test/test_support.py
 %%JYTHON_DIR%%/Lib/test/test_symtable.py
+%%JYTHON_DIR%%/Lib/test/test_syntax.py
+%%JYTHON_DIR%%/Lib/test/test_sys.py
+%%JYTHON_DIR%%/Lib/test/test_sys_jy.py
+%%JYTHON_DIR%%/Lib/test/test_tarfile.py
+%%JYTHON_DIR%%/Lib/test/test_tcl.py
 %%JYTHON_DIR%%/Lib/test/test_tempfile.py
+%%JYTHON_DIR%%/Lib/test/test_textwrap.py
 %%JYTHON_DIR%%/Lib/test/test_thread.py
+%%JYTHON_DIR%%/Lib/test/test_thread_jy.py
+%%JYTHON_DIR%%/Lib/test/test_thread_local.py
 %%JYTHON_DIR%%/Lib/test/test_threaded_import.py
 %%JYTHON_DIR%%/Lib/test/test_threadedtempfile.py
 %%JYTHON_DIR%%/Lib/test/test_threading.py
+%%JYTHON_DIR%%/Lib/test/test_threading_jy.py
+%%JYTHON_DIR%%/Lib/test/test_threading_local.py
+%%JYTHON_DIR%%/Lib/test/test_threadsignals.py
 %%JYTHON_DIR%%/Lib/test/test_time.py
-%%JYTHON_DIR%%/Lib/test/test_timing.py
+%%JYTHON_DIR%%/Lib/test/test_timeit.py
+%%JYTHON_DIR%%/Lib/test/test_timeout.py
 %%JYTHON_DIR%%/Lib/test/test_tokenize.py
 %%JYTHON_DIR%%/Lib/test/test_trace.py
+%%JYTHON_DIR%%/Lib/test/test_trace_threaded.py
 %%JYTHON_DIR%%/Lib/test/test_traceback.py
+%%JYTHON_DIR%%/Lib/test/test_traceback_jy.py
+%%JYTHON_DIR%%/Lib/test/test_transformer.py
+%%JYTHON_DIR%%/Lib/test/test_tuple.py
 %%JYTHON_DIR%%/Lib/test/test_types.py
 %%JYTHON_DIR%%/Lib/test/test_ucn.py
 %%JYTHON_DIR%%/Lib/test/test_unary.py
 %%JYTHON_DIR%%/Lib/test/test_unicode.py
 %%JYTHON_DIR%%/Lib/test/test_unicode_file.py
+%%JYTHON_DIR%%/Lib/test/test_unicode_jy.py
 %%JYTHON_DIR%%/Lib/test/test_unicodedata.py
+%%JYTHON_DIR%%/Lib/test/test_unittest.py
+%%JYTHON_DIR%%/Lib/test/test_univnewlines.py
 %%JYTHON_DIR%%/Lib/test/test_unpack.py
 %%JYTHON_DIR%%/Lib/test/test_urllib.py
 %%JYTHON_DIR%%/Lib/test/test_urllib2.py
+%%JYTHON_DIR%%/Lib/test/test_urllib2_localnet.py
+%%JYTHON_DIR%%/Lib/test/test_urllib2net.py
+%%JYTHON_DIR%%/Lib/test/test_urllibnet.py
 %%JYTHON_DIR%%/Lib/test/test_urlparse.py
 %%JYTHON_DIR%%/Lib/test/test_userdict.py
 %%JYTHON_DIR%%/Lib/test/test_userlist.py
 %%JYTHON_DIR%%/Lib/test/test_userstring.py
 %%JYTHON_DIR%%/Lib/test/test_uu.py
+%%JYTHON_DIR%%/Lib/test/test_uuid.py
+%%JYTHON_DIR%%/Lib/test/test_wait3.py
+%%JYTHON_DIR%%/Lib/test/test_wait4.py
+%%JYTHON_DIR%%/Lib/test/test_warnings.py
 %%JYTHON_DIR%%/Lib/test/test_wave.py
 %%JYTHON_DIR%%/Lib/test/test_weakref.py
+%%JYTHON_DIR%%/Lib/test/test_weakref_jy.py
+%%JYTHON_DIR%%/Lib/test/test_whichdb.py
 %%JYTHON_DIR%%/Lib/test/test_winreg.py
 %%JYTHON_DIR%%/Lib/test/test_winsound.py
+%%JYTHON_DIR%%/Lib/test/test_with.py
+%%JYTHON_DIR%%/Lib/test/test_wsgiref.py
+%%JYTHON_DIR%%/Lib/test/test_xdrlib.py
+%%JYTHON_DIR%%/Lib/test/test_xml_etree.py
+%%JYTHON_DIR%%/Lib/test/test_xml_etree_c.py
+%%JYTHON_DIR%%/Lib/test/test_xml_etree_jy.py
 %%JYTHON_DIR%%/Lib/test/test_xmllib.py
 %%JYTHON_DIR%%/Lib/test/test_xmlrpc.py
-%%JYTHON_DIR%%/Lib/test/test_xreadline.py
+%%JYTHON_DIR%%/Lib/test/test_xpickle.py
+%%JYTHON_DIR%%/Lib/test/test_xrange.py
 %%JYTHON_DIR%%/Lib/test/test_zipfile.py
+%%JYTHON_DIR%%/Lib/test/test_zipfile64.py
+%%JYTHON_DIR%%/Lib/test/test_zipimport.py
+%%JYTHON_DIR%%/Lib/test/test_zipimport_jy.py
 %%JYTHON_DIR%%/Lib/test/test_zlib.py
+%%JYTHON_DIR%%/Lib/test/test_zlib_jy.py
 %%JYTHON_DIR%%/Lib/test/testall.py
 %%JYTHON_DIR%%/Lib/test/testcodec.py
 %%JYTHON_DIR%%/Lib/test/testimg.uue
 %%JYTHON_DIR%%/Lib/test/testimgr.uue
 %%JYTHON_DIR%%/Lib/test/testrgb.uue
-%%JYTHON_DIR%%/Lib/test/tokenize_tests.py
+%%JYTHON_DIR%%/Lib/test/testtar.tar
+%%JYTHON_DIR%%/Lib/test/tf_inherit_check.py
+%%JYTHON_DIR%%/Lib/test/threaded_import_hangers.py
+%%JYTHON_DIR%%/Lib/test/time_hashlib.py
+%%JYTHON_DIR%%/Lib/test/tokenize_tests.txt
 %%JYTHON_DIR%%/Lib/test/whrandom.py
+%%JYTHON_DIR%%/Lib/test/xmltests.py
 %%JYTHON_DIR%%/Lib/test/zxjdbc/dbextstest.py
 %%JYTHON_DIR%%/Lib/test/zxjdbc/jndi.py
 %%JYTHON_DIR%%/Lib/test/zxjdbc/runner.py
@@ -913,22 +1495,33 @@ etc/jython.reg
 %%JYTHON_DIR%%/Lib/test/zxjdbc/test.xml
 %%JYTHON_DIR%%/Lib/test/zxjdbc/test_zxjdbc_dbapi20.py
 %%JYTHON_DIR%%/Lib/test/zxjdbc/zxtest.py
+%%JYTHON_DIR%%/Lib/textwrap.py
 %%JYTHON_DIR%%/Lib/this.py
 %%JYTHON_DIR%%/Lib/threading.py
+%%JYTHON_DIR%%/Lib/timeit.py
 %%JYTHON_DIR%%/Lib/token.py
 %%JYTHON_DIR%%/Lib/tokenize.py
+%%JYTHON_DIR%%/Lib/trace.py
 %%JYTHON_DIR%%/Lib/traceback.py
-%%JYTHON_DIR%%/Lib/tzparse.py
+%%JYTHON_DIR%%/Lib/types.py
+%%JYTHON_DIR%%/Lib/unicodedata.py
 %%JYTHON_DIR%%/Lib/unittest.py
 %%JYTHON_DIR%%/Lib/urllib.py
 %%JYTHON_DIR%%/Lib/urllib2.py
 %%JYTHON_DIR%%/Lib/urlparse.py
 %%JYTHON_DIR%%/Lib/user.py
 %%JYTHON_DIR%%/Lib/uu.py
+%%JYTHON_DIR%%/Lib/uuid.py
 %%JYTHON_DIR%%/Lib/warnings.py
 %%JYTHON_DIR%%/Lib/weakref.py
 %%JYTHON_DIR%%/Lib/whichdb.py
-%%JYTHON_DIR%%/Lib/whrandom.py
+%%JYTHON_DIR%%/Lib/wsgiref.egg-info
+%%JYTHON_DIR%%/Lib/wsgiref/__init__.py
+%%JYTHON_DIR%%/Lib/wsgiref/handlers.py
+%%JYTHON_DIR%%/Lib/wsgiref/headers.py
+%%JYTHON_DIR%%/Lib/wsgiref/simple_server.py
+%%JYTHON_DIR%%/Lib/wsgiref/util.py
+%%JYTHON_DIR%%/Lib/wsgiref/validate.py
 %%JYTHON_DIR%%/Lib/xdrlib.py
 %%JYTHON_DIR%%/Lib/xml/FtCore.py
 %%JYTHON_DIR%%/Lib/xml/Uri.py
@@ -941,6 +1534,13 @@ etc/jython.reg
 %%JYTHON_DIR%%/Lib/xml/dom/minidom.py
 %%JYTHON_DIR%%/Lib/xml/dom/pulldom.py
 %%JYTHON_DIR%%/Lib/xml/dom/xmlbuilder.py
+%%JYTHON_DIR%%/Lib/xml/etree/ElementInclude.py
+%%JYTHON_DIR%%/Lib/xml/etree/ElementPath.py
+%%JYTHON_DIR%%/Lib/xml/etree/ElementTree.py
+%%JYTHON_DIR%%/Lib/xml/etree/__init__.py
+%%JYTHON_DIR%%/Lib/xml/etree/cElementTree.py
+%%JYTHON_DIR%%/Lib/xml/parsers/__init__.py
+%%JYTHON_DIR%%/Lib/xml/parsers/expat.py
 %%JYTHON_DIR%%/Lib/xml/sax/__init__.py
 %%JYTHON_DIR%%/Lib/xml/sax/_exceptions.py
 %%JYTHON_DIR%%/Lib/xml/sax/drivers2/__init__.py
@@ -955,64 +1555,142 @@ etc/jython.reg
 %%JYTHON_DIR%%/Lib/zlib.py
 %%JYTHON_DIR%%/NEWS
 %%JYTHON_DIR%%/README.txt
-%%JYTHON_DIR%%/Tools/freeze/FreezeVisitor.py
-%%JYTHON_DIR%%/Tools/freeze/Freezer.py
-%%JYTHON_DIR%%/Tools/freeze/Output.py
-%%JYTHON_DIR%%/Tools/freeze/freeze.py
-%%JYTHON_DIR%%/Tools/jythonc/ImportName.py
-%%JYTHON_DIR%%/Tools/jythonc/JavaCall.py
-%%JYTHON_DIR%%/Tools/jythonc/Object.py
-%%JYTHON_DIR%%/Tools/jythonc/ObjectFactory.py
-%%JYTHON_DIR%%/Tools/jythonc/PathVFS.py
-%%JYTHON_DIR%%/Tools/jythonc/PythonModule.py
-%%JYTHON_DIR%%/Tools/jythonc/SrcGenCompiler.py
-%%JYTHON_DIR%%/Tools/jythonc/compile.py
-%%JYTHON_DIR%%/Tools/jythonc/depend.py
-%%JYTHON_DIR%%/Tools/jythonc/jar.py
-%%JYTHON_DIR%%/Tools/jythonc/jast/Modifier.py
-%%JYTHON_DIR%%/Tools/jythonc/jast/Output.py
-%%JYTHON_DIR%%/Tools/jythonc/jast/Statement.py
-%%JYTHON_DIR%%/Tools/jythonc/jast/__init__.py
-%%JYTHON_DIR%%/Tools/jythonc/javac.py
-%%JYTHON_DIR%%/Tools/jythonc/jythonc.py
-%%JYTHON_DIR%%/Tools/jythonc/main.py
-%%JYTHON_DIR%%/Tools/jythonc/proxies.py
-%%JYTHON_DIR%%/Tools/jythonc/util.py
-%%JYTHON_DIR%%/Tools/jythonc/yapm.py
-%%JYTHON_DIR%%/Tools/mkjava.py
-%%JYTHON_DIR%%/build.Lib.include.properties
-%%JYTHON_DIR%%/build.xml
+%%JYTHON_DIR%%/bin/jython
 %%JYTHON_DIR%%/jython
 %%JYTHON_DIR%%/jython.jar
-%%JYTHON_DIR%%/jythonc
 %%JYTHON_DIR%%/registry
 @exec ln -sf %B/jython %%PREFIX%%/bin/
-@exec ln -sf %B/jythonc %%PREFIX%%/bin/
 @exec ln -sf %B/registry %%PREFIX%%/etc/jython.reg
 @exec %B/jython -Dpython.cachedir=%B/cachedir -c None
 @exec rm -rf %B/cachedir
 @unexec find -H %B/Lib -name '*$py.class' -type f -delete
-@dirrm %%JYTHON_DIR%%/Tools/jythonc/jast
-@dirrm %%JYTHON_DIR%%/Tools/jythonc
-@dirrm %%JYTHON_DIR%%/Tools/freeze
-@dirrm %%JYTHON_DIR%%/Tools
+%%JYTHON_DIR%%/tests/java/javatests/AnonInner.java
+%%JYTHON_DIR%%/tests/java/javatests/BigDecimalTest.java
+%%JYTHON_DIR%%/tests/java/javatests/Dict2JavaTest.java
+%%JYTHON_DIR%%/tests/java/javatests/Foo.java
+%%JYTHON_DIR%%/tests/java/javatests/JOverload.java
+%%JYTHON_DIR%%/tests/java/javatests/ListTest.java
+%%JYTHON_DIR%%/tests/java/javatests/PySetInJavaTest.java
+%%JYTHON_DIR%%/tests/java/javatests/SubFoo.java
+%%JYTHON_DIR%%/tests/java/javatests/TestSupport.java
+%%JYTHON_DIR%%/tests/java/org/python/antlr/GrammarTester.java
+%%JYTHON_DIR%%/tests/java/org/python/antlr/PythonPartialTester.java
+%%JYTHON_DIR%%/tests/java/org/python/antlr/PythonTreeTester.java
+%%JYTHON_DIR%%/tests/java/org/python/antlr/WalkerTester.java
+%%JYTHON_DIR%%/tests/java/org/python/core/PyListTest.java
+%%JYTHON_DIR%%/tests/java/org/python/core/PySystemState_registry_Test.java
+%%JYTHON_DIR%%/tests/java/org/python/core/PyTupleTest.java
+%%JYTHON_DIR%%/tests/java/org/python/expose/generate/DescriptorExposerTest.java
+%%JYTHON_DIR%%/tests/java/org/python/expose/generate/ExposeMethodFinderTest.java
+%%JYTHON_DIR%%/tests/java/org/python/expose/generate/ExposedTypeProcessorTest.java
+%%JYTHON_DIR%%/tests/java/org/python/expose/generate/ExposedTypeVisitorTest.java
+%%JYTHON_DIR%%/tests/java/org/python/expose/generate/InterpTestCase.java
+%%JYTHON_DIR%%/tests/java/org/python/expose/generate/MethodExposerTest.java
+%%JYTHON_DIR%%/tests/java/org/python/expose/generate/NewExposerTest.java
+%%JYTHON_DIR%%/tests/java/org/python/expose/generate/OverridableNewExposerTest.java
+%%JYTHON_DIR%%/tests/java/org/python/expose/generate/SimpleExposed.java
+%%JYTHON_DIR%%/tests/java/org/python/expose/generate/TypeExposerTest.java
+%%JYTHON_DIR%%/tests/java/org/python/jsr223/ScriptEngineIOTest.java
+%%JYTHON_DIR%%/tests/java/org/python/jsr223/ScriptEngineTest.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/BadStaticInitializer.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/BeanImplementation.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/BeanInterface.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/Callbacker.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/Child.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/Child2.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/Coercions.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/CustomizableMapHolder.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/ExceptionTest.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/HiddenSuper.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/InterfaceCombination.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/Invisible.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/Listenable.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/Matryoshka.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/OnlySubclassable.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/OtherSubVisible.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/OwnMethodCaller.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/Parent.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/RedundantInterfaceDeclarations.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/RespectJavaAccessibility.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/SerializationTest.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/SomePyMethods.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/SubVisible.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/VisibilityResults.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/Visible.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/VisibleOverride.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/identity/IdentityObject.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/identity/IdentityTest.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/inbred/Metis.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/inbred/Zeus.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/mro/ConfusedOnGetitemAdd.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/mro/ConfusedOnImport.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/mro/FirstAndPost.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/mro/FirstAndSecond.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/mro/FirstPredefinedGetitem.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/mro/GetitemAdder.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/mro/PostAndFirst.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/mro/PostdefinedGetitem.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/mro/SecondAndFirst.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/mro/SecondPredefinedGetitem.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/multihidden/BaseConnection.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/multihidden/SpecialConnection.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/props/BeanPropertyTest.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/props/PropShadow.java
+%%JYTHON_DIR%%/tests/java/org/python/tests/props/Readonly.java
+%%JYTHON_DIR%%/tests/java/org/python/util/InterpreterTest.java
+%%JYTHON_DIR%%/tests/java/org/python/util/jythonTest.java
+@dirrm %%JYTHON_DIR%%/tests/java/org/python/util
+@dirrm %%JYTHON_DIR%%/tests/java/org/python/tests/props
+@dirrm %%JYTHON_DIR%%/tests/java/org/python/tests/multihidden
+@dirrm %%JYTHON_DIR%%/tests/java/org/python/tests/mro
+@dirrm %%JYTHON_DIR%%/tests/java/org/python/tests/inbred
+@dirrm %%JYTHON_DIR%%/tests/java/org/python/tests/identity
+@dirrm %%JYTHON_DIR%%/tests/java/org/python/tests
+@dirrm %%JYTHON_DIR%%/tests/java/org/python/jsr223
+@dirrm %%JYTHON_DIR%%/tests/java/org/python/expose/generate
+@dirrm %%JYTHON_DIR%%/tests/java/org/python/expose
+@dirrm %%JYTHON_DIR%%/tests/java/org/python/core
+@dirrm %%JYTHON_DIR%%/tests/java/org/python/antlr
+@dirrm %%JYTHON_DIR%%/tests/java/org/python
+@dirrm %%JYTHON_DIR%%/tests/java/org
+@dirrm %%JYTHON_DIR%%/tests/java/javatests
+@dirrm %%JYTHON_DIR%%/tests/java
+@dirrm %%JYTHON_DIR%%/tests
+@dirrm %%JYTHON_DIR%%/bin
 @dirrm %%JYTHON_DIR%%/Lib/xml/sax/drivers2
 @dirrm %%JYTHON_DIR%%/Lib/xml/sax
+@dirrm %%JYTHON_DIR%%/Lib/xml/parsers
+@dirrm %%JYTHON_DIR%%/Lib/xml/etree
 @dirrm %%JYTHON_DIR%%/Lib/xml/dom
 @dirrm %%JYTHON_DIR%%/Lib/xml
+@dirrm %%JYTHON_DIR%%/Lib/wsgiref
 @dirrm %%JYTHON_DIR%%/Lib/test/zxjdbc
+@dirrm %%JYTHON_DIR%%/Lib/test/test_metaclass_support
+@dirrm %%JYTHON_DIR%%/Lib/test/pyservlet
+@dirrm %%JYTHON_DIR%%/Lib/test/pbcvm/test
+@dirrm %%JYTHON_DIR%%/Lib/test/pbcvm
 @dirrm %%JYTHON_DIR%%/Lib/test/output
-@dirrm %%JYTHON_DIR%%/Lib/test/javatests
-@dirrm %%JYTHON_DIR%%/Lib/test/data
+@dirrm %%JYTHON_DIR%%/Lib/test/leakers
+@dirrm %%JYTHON_DIR%%/Lib/test/decimaltestdata
+@dirrm %%JYTHON_DIR%%/Lib/test/crashers
 @dirrm %%JYTHON_DIR%%/Lib/test/bugs/pr133
 @dirrm %%JYTHON_DIR%%/Lib/test/bugs
+@dirrm %%JYTHON_DIR%%/Lib/test/bug1126
 @dirrm %%JYTHON_DIR%%/Lib/test
+@dirrm %%JYTHON_DIR%%/Lib/site-packages
 @dirrm %%JYTHON_DIR%%/Lib/pawt
-@dirrm %%JYTHON_DIR%%/Lib/jxxload_help
+@dirrm %%JYTHON_DIR%%/Lib/modjy
+@dirrm %%JYTHON_DIR%%/Lib/logging
 @dirrm %%JYTHON_DIR%%/Lib/encodings
 @dirrm %%JYTHON_DIR%%/Lib/email/test/data
 @dirrm %%JYTHON_DIR%%/Lib/email/test
+@dirrm %%JYTHON_DIR%%/Lib/email/mime
 @dirrm %%JYTHON_DIR%%/Lib/email
+@dirrm %%JYTHON_DIR%%/Lib/distutils/tests
+@dirrm %%JYTHON_DIR%%/Lib/distutils/command
+@dirrm %%JYTHON_DIR%%/Lib/distutils
+@dirrm %%JYTHON_DIR%%/Lib/compiler
+@dirrm %%JYTHON_DIR%%/Lib/collections
 @dirrm %%JYTHON_DIR%%/Lib
 @dirrm %%JYTHON_DIR%%/Doc/javadoc/resources
 @dirrm %%JYTHON_DIR%%/Doc/javadoc/org/python/util
@@ -1022,11 +1700,16 @@ etc/jython.reg
 @dirrm %%JYTHON_DIR%%/Doc/javadoc/com/ziclix/python/sql
 @dirrm %%JYTHON_DIR%%/Doc/javadoc/com/ziclix/python
 @dirrm %%JYTHON_DIR%%/Doc/javadoc/com/ziclix
+@dirrm %%JYTHON_DIR%%/Doc/javadoc/com/xhaus/modjy
+@dirrm %%JYTHON_DIR%%/Doc/javadoc/com/xhaus
 @dirrm %%JYTHON_DIR%%/Doc/javadoc/com
 @dirrm %%JYTHON_DIR%%/Doc/javadoc
-@dirrm %%JYTHON_DIR%%/Doc/images
 @dirrm %%JYTHON_DIR%%/Doc
 @dirrm %%JYTHON_DIR%%/Demo/swing
+@dirrm %%JYTHON_DIR%%/Demo/modjy_webapp/WEB-INF/lib-python
+@dirrm %%JYTHON_DIR%%/Demo/modjy_webapp/WEB-INF/lib
+@dirrm %%JYTHON_DIR%%/Demo/modjy_webapp/WEB-INF
+@dirrm %%JYTHON_DIR%%/Demo/modjy_webapp
 @dirrm %%JYTHON_DIR%%/Demo/jreload/src/example
 @dirrm %%JYTHON_DIR%%/Demo/jreload/src
 @dirrm %%JYTHON_DIR%%/Demo/jreload/_xample