Merge branch 'next' into performance

Left some rename conflicts partially unresolved, need to move src/c/ to
cheetah/c/ in the next commit

Conflicts:
	SetupConfig.py
	cheetah/_namemapper.c
	src/_namemapper.c
	src/c/_namemapper.c

62 files changed, 14 insertions, 14 deletions

diff --git a/SetupConfig.py b/SetupConfig.py
index 9508e3c..52b6926 100644
--- a/SetupConfig.py
+++ b/SetupConfig.py
@@ -1,6 +1,6 @@
 #-------Main Package Settings-----------#
 name = 'Cheetah'
-from src.Version import Version as version
+from cheetah.Version import Version as version
 maintainer = "R. Tyler Ballance"
 author = "Tavis Rudd"
 author_email = "cheetahtemplate-discuss@lists.sf.net"
@@ -11,7 +11,6 @@ packages = ['Cheetah',
             'Cheetah.Tests',
             'Cheetah.Tools',
             'Cheetah.Utils',
-            'Cheetah.contrib',
             ]
 classifiers = [line.strip() for line in '''\
   #Development Status :: 4 - Beta
@@ -30,7 +29,7 @@ classifiers = [line.strip() for line in '''\
   Topic :: Text Processing'''.splitlines() if not line.strip().startswith('#')]
 del line
 
-package_dir = {'Cheetah':'src'}
+package_dir = {'Cheetah':'cheetah'}
 
 import os
 import os.path
@@ -52,10 +51,12 @@ ext_modules=[
 scripts = ['bin/cheetah-compile',
            'bin/cheetah',
            ]
+
 if sys.platform == "win32":
     scripts.append('bin/cheetah.bat')
-data_files = ['recursive: src *.tmpl *.txt LICENSE README TODO CHANGES',
-              ]
+
+data_files = ['recursive: src *.tmpl *.txt LICENSE README TODO CHANGES',]
+
 if not os.getenv('CHEETAH_INSTALL_WITHOUT_SETUPTOOLS'):
     try:
         from setuptools import setup
diff --git a/SetupTools.py b/SetupTools.py
index 1fcaf4c..6f0c302 100644
--- a/SetupTools.py
+++ b/SetupTools.py
@@ -19,7 +19,7 @@ from distutils.core import Command
 from distutils.command.install_data import install_data
 
 #imports from Cheetah ...
-from src.FileUtils import findFiles
+from cheetah.FileUtils import findFiles
 
 ##################################################
 ## CLASSES ##
diff --git a/src/CacheRegion.py b/cheetah/CacheRegion.py
index dd0d099..dd0d099 100644
--- a/src/CacheRegion.py
+++ b/cheetah/CacheRegion.py
diff --git a/src/CacheStore.py b/cheetah/CacheStore.py
index 9c41656..9c41656 100644
--- a/src/CacheStore.py
+++ b/cheetah/CacheStore.py
diff --git a/src/CheetahWrapper.py b/cheetah/CheetahWrapper.py
index 96f57d5..96f57d5 100644
--- a/src/CheetahWrapper.py
+++ b/cheetah/CheetahWrapper.py
diff --git a/src/Compiler.py b/cheetah/Compiler.py
index 39c7f51..39c7f51 100644
--- a/src/Compiler.py
+++ b/cheetah/Compiler.py
diff --git a/src/Django.py b/cheetah/Django.py
index 876fbbc..876fbbc 100644
--- a/src/Django.py
+++ b/cheetah/Django.py
diff --git a/src/DummyTransaction.py b/cheetah/DummyTransaction.py
index 26d2ea7..26d2ea7 100644
--- a/src/DummyTransaction.py
+++ b/cheetah/DummyTransaction.py
diff --git a/src/ErrorCatchers.py b/cheetah/ErrorCatchers.py
index a8b7035..a8b7035 100644
--- a/src/ErrorCatchers.py
+++ b/cheetah/ErrorCatchers.py
diff --git a/src/FileUtils.py b/cheetah/FileUtils.py
index 97e77f8..97e77f8 100644
--- a/src/FileUtils.py
+++ b/cheetah/FileUtils.py
diff --git a/src/Filters.py b/cheetah/Filters.py
index 3c6c688..dd65f28 100644
--- a/src/Filters.py
+++ b/cheetah/Filters.py
@@ -5,7 +5,6 @@
     #transform results in a filter on the entirety of the output
 '''
 import sys
-import Cheetah.contrib
 
 # Additional entities WebSafe knows how to transform.  No need to include
 # '<', '>' or '&' since those will have been done already.
@@ -85,11 +84,8 @@ class Markdown(EncodeUnicode):
     def filter(self,  value, **kwargs):
         # This is a bit of a hack to allow outright embedding of the markdown module
         try:
-            markdown_path = '/'.join(Cheetah.contrib.__file__.split('/')[:-1])
-            sys.path.append(markdown_path)
-            from Cheetah.contrib import markdown
-            sys.path.pop()
-        except:
+            import markdown
+        except ImportError:
             print '>>> Exception raised importing the "markdown" module'
             print '>>> Are you sure you have the ElementTree module installed?'
             print '          http://effbot.org/downloads/#elementtree'
diff --git a/src/ImportHooks.py b/cheetah/ImportHooks.py
index 261fb01..261fb01 100755
--- a/src/ImportHooks.py
+++ b/cheetah/ImportHooks.py
diff --git a/src/ImportManager.py b/cheetah/ImportManager.py
index 743360e..743360e 100755
--- a/src/ImportManager.py
+++ b/cheetah/ImportManager.py
diff --git a/src/Macros/I18n.py b/cheetah/Macros/I18n.py
index 7c2b1ef..7c2b1ef 100644
--- a/src/Macros/I18n.py
+++ b/cheetah/Macros/I18n.py
diff --git a/src/Macros/__init__.py b/cheetah/Macros/__init__.py
index 792d600..792d600 100644
--- a/src/Macros/__init__.py
+++ b/cheetah/Macros/__init__.py
diff --git a/src/NameMapper.py b/cheetah/NameMapper.py
index 3a6322e..3a6322e 100644
--- a/src/NameMapper.py
+++ b/cheetah/NameMapper.py
diff --git a/src/Parser.py b/cheetah/Parser.py
index 7436e9c..7436e9c 100644
--- a/src/Parser.py
+++ b/cheetah/Parser.py
diff --git a/src/Servlet.py b/cheetah/Servlet.py
index f19e508..f19e508 100644
--- a/src/Servlet.py
+++ b/cheetah/Servlet.py
diff --git a/src/SettingsManager.py b/cheetah/SettingsManager.py
index dfb396b..dfb396b 100644
--- a/src/SettingsManager.py
+++ b/cheetah/SettingsManager.py
diff --git a/src/SourceReader.py b/cheetah/SourceReader.py
index 0dc0e60..0dc0e60 100644
--- a/src/SourceReader.py
+++ b/cheetah/SourceReader.py
diff --git a/src/Template.py b/cheetah/Template.py
index eeeeb95..eeeeb95 100644
--- a/src/Template.py
+++ b/cheetah/Template.py
diff --git a/src/TemplateCmdLineIface.py b/cheetah/TemplateCmdLineIface.py
index 16a90cf..16a90cf 100644
--- a/src/TemplateCmdLineIface.py
+++ b/cheetah/TemplateCmdLineIface.py
diff --git a/src/Templates/SkeletonPage.py b/cheetah/Templates/SkeletonPage.py
index 04bf4fc..04bf4fc 100644
--- a/src/Templates/SkeletonPage.py
+++ b/cheetah/Templates/SkeletonPage.py
diff --git a/src/Templates/SkeletonPage.tmpl b/cheetah/Templates/SkeletonPage.tmpl
index 43c5ecd..43c5ecd 100644
--- a/src/Templates/SkeletonPage.tmpl
+++ b/cheetah/Templates/SkeletonPage.tmpl
diff --git a/src/Templates/_SkeletonPage.py b/cheetah/Templates/_SkeletonPage.py
index fe01ebf..fe01ebf 100644
--- a/src/Templates/_SkeletonPage.py
+++ b/cheetah/Templates/_SkeletonPage.py
diff --git a/src/Templates/__init__.py b/cheetah/Templates/__init__.py
index 8b13789..8b13789 100644
--- a/src/Templates/__init__.py
+++ b/cheetah/Templates/__init__.py
diff --git a/src/Tests/CheetahWrapper.py b/cheetah/Tests/CheetahWrapper.py
index ca7b0ae..ca7b0ae 100644
--- a/src/Tests/CheetahWrapper.py
+++ b/cheetah/Tests/CheetahWrapper.py
diff --git a/src/Tests/Filters.py b/cheetah/Tests/Filters.py
index bf35440..bf35440 100644
--- a/src/Tests/Filters.py
+++ b/cheetah/Tests/Filters.py
diff --git a/src/Tests/NameMapper.py b/cheetah/Tests/NameMapper.py
index 5d6b8b6..5d6b8b6 100644
--- a/src/Tests/NameMapper.py
+++ b/cheetah/Tests/NameMapper.py
diff --git a/src/Tests/Regressions.py b/cheetah/Tests/Regressions.py
index b5ba3d0..b5ba3d0 100644
--- a/src/Tests/Regressions.py
+++ b/cheetah/Tests/Regressions.py
diff --git a/src/Tests/SyntaxAndOutput.py b/cheetah/Tests/SyntaxAndOutput.py
index 78e0cc5..78e0cc5 100644
--- a/src/Tests/SyntaxAndOutput.py
+++ b/cheetah/Tests/SyntaxAndOutput.py
diff --git a/src/Tests/Template.py b/cheetah/Tests/Template.py
index 085180d..085180d 100644
--- a/src/Tests/Template.py
+++ b/cheetah/Tests/Template.py
diff --git a/src/Tests/Test.py b/cheetah/Tests/Test.py
index 080f4fa..080f4fa 100755
--- a/src/Tests/Test.py
+++ b/cheetah/Tests/Test.py
diff --git a/src/Tests/Unicode.py b/cheetah/Tests/Unicode.py
index da59bed..da59bed 100644
--- a/src/Tests/Unicode.py
+++ b/cheetah/Tests/Unicode.py
diff --git a/src/Tests/__init__.py b/cheetah/Tests/__init__.py
index 792d600..792d600 100644
--- a/src/Tests/__init__.py
+++ b/cheetah/Tests/__init__.py
diff --git a/src/Tests/unittest_local_copy.py b/cheetah/Tests/unittest_local_copy.py
index a5f5499..a5f5499 100755
--- a/src/Tests/unittest_local_copy.py
+++ b/cheetah/Tests/unittest_local_copy.py
diff --git a/src/Tests/xmlrunner.py b/cheetah/Tests/xmlrunner.py
index dc49c56..dc49c56 100644
--- a/src/Tests/xmlrunner.py
+++ b/cheetah/Tests/xmlrunner.py
diff --git a/src/Tools/CGITemplate.py b/cheetah/Tools/CGITemplate.py
index c94ddc4..c94ddc4 100644
--- a/src/Tools/CGITemplate.py
+++ b/cheetah/Tools/CGITemplate.py
diff --git a/src/Tools/MondoReport.py b/cheetah/Tools/MondoReport.py
index d0fada2..d0fada2 100644
--- a/src/Tools/MondoReport.py
+++ b/cheetah/Tools/MondoReport.py
diff --git a/src/Tools/MondoReportDoc.txt b/cheetah/Tools/MondoReportDoc.txt
index 29a026d..29a026d 100644
--- a/src/Tools/MondoReportDoc.txt
+++ b/cheetah/Tools/MondoReportDoc.txt
diff --git a/src/Tools/RecursiveNull.py b/cheetah/Tools/RecursiveNull.py
index d5c1ef0..d5c1ef0 100644
--- a/src/Tools/RecursiveNull.py
+++ b/cheetah/Tools/RecursiveNull.py
diff --git a/src/Tools/SiteHierarchy.py b/cheetah/Tools/SiteHierarchy.py
index 06da56f..06da56f 100644
--- a/src/Tools/SiteHierarchy.py
+++ b/cheetah/Tools/SiteHierarchy.py
diff --git a/src/Tools/__init__.py b/cheetah/Tools/__init__.py
index 506503b..506503b 100644
--- a/src/Tools/__init__.py
+++ b/cheetah/Tools/__init__.py
diff --git a/src/Tools/turbocheetah/__init__.py b/cheetah/Tools/turbocheetah/__init__.py
index 584583e..584583e 100644
--- a/src/Tools/turbocheetah/__init__.py
+++ b/cheetah/Tools/turbocheetah/__init__.py
diff --git a/src/Tools/turbocheetah/cheetahsupport.py b/cheetah/Tools/turbocheetah/cheetahsupport.py
index 682206f..682206f 100644
--- a/src/Tools/turbocheetah/cheetahsupport.py
+++ b/cheetah/Tools/turbocheetah/cheetahsupport.py
diff --git a/src/Tools/turbocheetah/tests/__init__.py b/cheetah/Tools/turbocheetah/tests/__init__.py
index 792d600..792d600 100644
--- a/src/Tools/turbocheetah/tests/__init__.py
+++ b/cheetah/Tools/turbocheetah/tests/__init__.py
diff --git a/src/Tools/turbocheetah/tests/test_template.py b/cheetah/Tools/turbocheetah/tests/test_template.py
index a6196e3..a6196e3 100644
--- a/src/Tools/turbocheetah/tests/test_template.py
+++ b/cheetah/Tools/turbocheetah/tests/test_template.py
diff --git a/src/Unspecified.py b/cheetah/Unspecified.py
index 89c5176..89c5176 100644
--- a/src/Unspecified.py
+++ b/cheetah/Unspecified.py
diff --git a/src/Utils/Indenter.py b/cheetah/Utils/Indenter.py
index 52c142d..52c142d 100644
--- a/src/Utils/Indenter.py
+++ b/cheetah/Utils/Indenter.py
diff --git a/src/Utils/Misc.py b/cheetah/Utils/Misc.py
index 6ff5bb2..6ff5bb2 100644
--- a/src/Utils/Misc.py
+++ b/cheetah/Utils/Misc.py
diff --git a/src/Utils/VerifyType.py b/cheetah/Utils/VerifyType.py
index 11a435d..11a435d 100644
--- a/src/Utils/VerifyType.py
+++ b/cheetah/Utils/VerifyType.py
diff --git a/src/Utils/WebInputMixin.py b/cheetah/Utils/WebInputMixin.py
index 52b6220..52b6220 100644
--- a/src/Utils/WebInputMixin.py
+++ b/cheetah/Utils/WebInputMixin.py
diff --git a/src/Utils/__init__.py b/cheetah/Utils/__init__.py
index 792d600..792d600 100644
--- a/src/Utils/__init__.py
+++ b/cheetah/Utils/__init__.py
diff --git a/src/Utils/htmlDecode.py b/cheetah/Utils/htmlDecode.py
index 2832a74..2832a74 100644
--- a/src/Utils/htmlDecode.py
+++ b/cheetah/Utils/htmlDecode.py
diff --git a/src/Utils/htmlEncode.py b/cheetah/Utils/htmlEncode.py
index f76c77e..f76c77e 100644
--- a/src/Utils/htmlEncode.py
+++ b/cheetah/Utils/htmlEncode.py
diff --git a/src/Utils/memcache.py b/cheetah/Utils/memcache.py
index ee9678d..ee9678d 100644
--- a/src/Utils/memcache.py
+++ b/cheetah/Utils/memcache.py
diff --git a/src/Utils/statprof.py b/cheetah/Utils/statprof.py
index 55638eb..55638eb 100644
--- a/src/Utils/statprof.py
+++ b/cheetah/Utils/statprof.py
diff --git a/src/Version.py b/cheetah/Version.py
index 747b176..747b176 100644
--- a/src/Version.py
+++ b/cheetah/Version.py
diff --git a/src/__init__.py b/cheetah/__init__.py
index 910574b..910574b 100644
--- a/src/__init__.py
+++ b/cheetah/__init__.py
diff --git a/src/convertTmplPathToModuleName.py b/cheetah/convertTmplPathToModuleName.py
index 4f9d8ea..4f9d8ea 100644
--- a/src/convertTmplPathToModuleName.py
+++ b/cheetah/convertTmplPathToModuleName.py
diff --git a/src/contrib/__init__.py b/src/contrib/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/src/contrib/__init__.py
+++ /dev/null
diff --git a/www/conf.py b/www/conf.py
index 4c28ecf..9a55e8f 100644
--- a/www/conf.py
+++ b/www/conf.py
@@ -22,7 +22,10 @@ import sys, os
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc']
+extensions = [
+    'sphinx.ext.autodoc',
+    'github.tools.sphinx',
+    ]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -99,7 +102,7 @@ html_theme = 'sphinxdoc'
 #html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+html_theme_path = ['.']
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".