3 files changed, 168 insertions, 128 deletions

diff --git a/devel/py-cheetah/Makefile b/devel/py-cheetah/Makefile
index 46964100eb81..7343644601e3 100644
--- a/devel/py-cheetah/Makefile
+++ b/devel/py-cheetah/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	cheetah
-DISTVERSION=	2.0.1
-PORTERVISION=	1
+PORTVERSION=	2.2.1
+PORTREVISION=	0
 CATEGORIES=	devel textproc www python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cheetahtemplate
diff --git a/devel/py-cheetah/distinfo b/devel/py-cheetah/distinfo
index c0dcfc8d455a..1e292f9da201 100644
--- a/devel/py-cheetah/distinfo
+++ b/devel/py-cheetah/distinfo
@@ -1,3 +1,3 @@
-MD5 (Cheetah-2.0.1.tar.gz) = 7845a2950ea850a13c488a26b61ac50a
-SHA256 (Cheetah-2.0.1.tar.gz) = 70b618a03506831f59ba1ff8433907ee8d4ead5fc9f1b3f610d384e08a26938c
-SIZE (Cheetah-2.0.1.tar.gz) = 215295
+MD5 (Cheetah-2.2.1.tar.gz) = 137491aef378b502b2ee71c03b929faf
+SHA256 (Cheetah-2.2.1.tar.gz) = 34b4c6917599a1c8b33de77d2216312baf42c6b04e0cbf6b6b1b2054c89ed66b
+SIZE (Cheetah-2.2.1.tar.gz) = 243565
diff --git a/devel/py-cheetah/pkg-plist b/devel/py-cheetah/pkg-plist
index 9c5333df6342..2efb9a6fd3a2 100644
--- a/devel/py-cheetah/pkg-plist
+++ b/devel/py-cheetah/pkg-plist
@@ -1,175 +1,215 @@
 bin/cheetah
 bin/cheetah-compile
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/CacheStore.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/SettingsManager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Template.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/TemplateCmdLineIface.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/CacheRegion.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/CacheRegion.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/CacheRegion.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/CacheStore.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/CacheStore.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/CacheStore.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/CheetahWrapper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/FileUtils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/ImportHooks.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/NameMapper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/convertTmplPathToModuleName.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Filters.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Servlet.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/CheetahWrapper.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/CheetahWrapper.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Compiler.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Compiler.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Compiler.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Django.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Django.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Django.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/DummyTransaction.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/DummyTransaction.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/DummyTransaction.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/ErrorCatchers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Unspecified.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Parser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Version.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Compiler.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Filters.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/ImportManager.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/SourceReader.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/_namemapper.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/CacheStore.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/SettingsManager.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Template.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/TemplateCmdLineIface.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/CacheRegion.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/CheetahWrapper.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/ErrorCatchers.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/ErrorCatchers.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/FileUtils.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/FileUtils.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/FileUtils.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Filters.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Filters.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Filters.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/ImportHooks.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/ImportHooks.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/NameMapper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/convertTmplPathToModuleName.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Servlet.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/DummyTransaction.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Parser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/ErrorCatchers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Unspecified.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Version.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/ImportHooks.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/ImportManager.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/ImportManager.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/ImportManager.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Macros/I18n.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Macros/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Macros/I18n.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Macros/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Macros/I18n.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Macros/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Macros/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Macros/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Compiler.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/ImportManager.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/NameMapper.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/NameMapper.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/NameMapper.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Parser.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Parser.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Parser.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Servlet.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Servlet.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Servlet.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/SettingsManager.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/SettingsManager.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/SettingsManager.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/SourceReader.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/SourceReader.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/_namemapper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/_namemapper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Templates/_SkeletonPage.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/SourceReader.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Template.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Template.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Template.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/TemplateCmdLineIface.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/TemplateCmdLineIface.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/TemplateCmdLineIface.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Templates/SkeletonPage.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Templates/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Templates/_SkeletonPage.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Templates/SkeletonPage.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Templates/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Templates/SkeletonPage.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Templates/SkeletonPage.tmpl
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Templates/_SkeletonPage.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Templates/_SkeletonPage.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Templates/_SkeletonPage.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Templates/SkeletonPage.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Templates/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Templates/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Templates/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Template.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/CheetahWrapper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/NameMapper.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/FileRefresh.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/SyntaxAndOutput.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/unittest_local_copy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Test.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Template.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/CheetahWrapper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/NameMapper.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/FileRefresh.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/SyntaxAndOutput.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/unittest_local_copy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Test.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Template.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/CheetahWrapper.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Filters.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Filters.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Filters.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/NameMapper.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/NameMapper.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/NameMapper.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/FileRefresh.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Regressions.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Regressions.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Regressions.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/SyntaxAndOutput.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/SyntaxAndOutput.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/SyntaxAndOutput.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/unittest_local_copy.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Template.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Template.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Template.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Test.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Test.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Unicode.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Unicode.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/Unicode.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/SiteHierarchy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/RecursiveNull.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/unittest_local_copy.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/unittest_local_copy.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/unittest_local_copy.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/xmlrunner.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/xmlrunner.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests/xmlrunner.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/CGITemplate.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/MondoReport.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/SiteHierarchy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/RecursiveNull.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/CGITemplate.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/CGITemplate.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/MondoReport.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/MondoReport.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/MondoReport.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/MondoReportDoc.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/SiteHierarchy.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/RecursiveNull.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/RecursiveNull.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/RecursiveNull.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/CGITemplate.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/MondoReport.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/SiteHierarchy.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/SiteHierarchy.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/SiteHierarchy.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Unspecified.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Unspecified.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Unspecified.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/Indenter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/VerifyType.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/htmlEncode.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/htmlDecode.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/Misc.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/WebInputMixin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/memcache.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/Indenter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/VerifyType.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/htmlEncode.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/htmlDecode.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/Misc.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/WebInputMixin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/memcache.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/optik/option_parser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/optik/option.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/optik/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/optik/errors.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/optik/option_parser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/optik/option.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/optik/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/optik/errors.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/optik/option_parser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/optik/option.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/optik/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/optik/errors.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/Indenter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/VerifyType.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/htmlEncode.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/htmlDecode.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/Misc.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/Misc.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/Misc.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/VerifyType.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/VerifyType.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/VerifyType.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/WebInputMixin.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/WebInputMixin.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/WebInputMixin.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/htmlDecode.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/htmlDecode.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/htmlDecode.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/htmlEncode.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/htmlEncode.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/htmlEncode.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/memcache.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/memcache.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/memcache.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/CacheStore.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/SettingsManager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Template.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/TemplateCmdLineIface.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/CacheRegion.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/CheetahWrapper.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/FileUtils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/ImportHooks.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/NameMapper.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/convertTmplPathToModuleName.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Filters.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Servlet.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/DummyTransaction.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/ErrorCatchers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Unspecified.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Parser.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/statprof.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/statprof.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/statprof.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Version.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Version.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Version.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Compiler.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/ImportManager.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/SourceReader.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/_namemapper.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/_namemapper.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/_namemapper.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/_namemapper.so
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/blockparser.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/blockparser.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/blockparser.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/blockprocessors.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/blockprocessors.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/blockprocessors.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/commandline.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/commandline.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/commandline.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/etree_loader.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/etree_loader.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/etree_loader.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/html4.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/html4.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/html4.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/inlinepatterns.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/inlinepatterns.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/inlinepatterns.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/odict.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/odict.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/odict.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/postprocessors.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/postprocessors.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/postprocessors.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/preprocessors.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/preprocessors.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/preprocessors.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/treeprocessors.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/treeprocessors.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown/treeprocessors.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/convertTmplPathToModuleName.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/convertTmplPathToModuleName.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/convertTmplPathToModuleName.pyo
 %%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/top_level.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/cheetah-compile
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/cheetah
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/cheetah-compile
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils/optik
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib/markdown
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/contrib
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Utils
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tools
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/Cheetah/Tests