Permalink
Browse files

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
  • Loading branch information...
rtyler committed Aug 14, 2009
2 parents f8c53e6 + 53144ff commit 988f6da0fc7c211f654352ec1453f0ef168da7cf
Showing with 14 additions and 14 deletions.
  1. +6 −5 SetupConfig.py
  2. +1 −1 SetupTools.py
  3. 0 {src → cheetah}/CacheRegion.py
  4. 0 {src → cheetah}/CacheStore.py
  5. 0 {src → cheetah}/CheetahWrapper.py
  6. 0 {src → cheetah}/Compiler.py
  7. 0 {src → cheetah}/Django.py
  8. 0 {src → cheetah}/DummyTransaction.py
  9. 0 {src → cheetah}/ErrorCatchers.py
  10. 0 {src → cheetah}/FileUtils.py
  11. +2 −6 {src → cheetah}/Filters.py
  12. 0 {src → cheetah}/ImportHooks.py
  13. 0 {src → cheetah}/ImportManager.py
  14. 0 {src → cheetah}/Macros/I18n.py
  15. 0 {src → cheetah}/Macros/__init__.py
  16. 0 {src → cheetah}/NameMapper.py
  17. 0 {src → cheetah}/Parser.py
  18. 0 {src → cheetah}/Servlet.py
  19. 0 {src → cheetah}/SettingsManager.py
  20. 0 {src → cheetah}/SourceReader.py
  21. 0 {src → cheetah}/Template.py
  22. 0 {src → cheetah}/TemplateCmdLineIface.py
  23. 0 {src → cheetah}/Templates/SkeletonPage.py
  24. 0 {src → cheetah}/Templates/SkeletonPage.tmpl
  25. 0 {src → cheetah}/Templates/_SkeletonPage.py
  26. 0 {src → cheetah}/Templates/__init__.py
  27. 0 {src → cheetah}/Tests/CheetahWrapper.py
  28. 0 {src → cheetah}/Tests/Filters.py
  29. 0 {src → cheetah}/Tests/NameMapper.py
  30. 0 {src → cheetah}/Tests/Regressions.py
  31. 0 {src → cheetah}/Tests/SyntaxAndOutput.py
  32. 0 {src → cheetah}/Tests/Template.py
  33. 0 {src → cheetah}/Tests/Test.py
  34. 0 {src → cheetah}/Tests/Unicode.py
  35. 0 {src → cheetah}/Tests/__init__.py
  36. 0 {src → cheetah}/Tests/unittest_local_copy.py
  37. 0 {src → cheetah}/Tests/xmlrunner.py
  38. 0 {src → cheetah}/Tools/CGITemplate.py
  39. 0 {src → cheetah}/Tools/MondoReport.py
  40. 0 {src → cheetah}/Tools/MondoReportDoc.txt
  41. 0 {src → cheetah}/Tools/RecursiveNull.py
  42. 0 {src → cheetah}/Tools/SiteHierarchy.py
  43. 0 {src → cheetah}/Tools/__init__.py
  44. 0 {src → cheetah}/Tools/turbocheetah/__init__.py
  45. 0 {src → cheetah}/Tools/turbocheetah/cheetahsupport.py
  46. 0 {src → cheetah}/Tools/turbocheetah/tests/__init__.py
  47. 0 {src → cheetah}/Tools/turbocheetah/tests/test_template.py
  48. 0 {src → cheetah}/Unspecified.py
  49. 0 {src → cheetah}/Utils/Indenter.py
  50. 0 {src → cheetah}/Utils/Misc.py
  51. 0 {src → cheetah}/Utils/VerifyType.py
  52. 0 {src → cheetah}/Utils/WebInputMixin.py
  53. 0 {src → cheetah}/Utils/__init__.py
  54. 0 {src → cheetah}/Utils/htmlDecode.py
  55. 0 {src → cheetah}/Utils/htmlEncode.py
  56. 0 {src → cheetah}/Utils/memcache.py
  57. 0 {src → cheetah}/Utils/statprof.py
  58. 0 {src → cheetah}/Version.py
  59. 0 {src → cheetah}/__init__.py
  60. 0 {src → cheetah}/convertTmplPathToModuleName.py
  61. 0 src/contrib/__init__.py
  62. +5 −2 www/conf.py
View
@@ -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 @@
'Cheetah.Tests',
'Cheetah.Tools',
'Cheetah.Utils',
- 'Cheetah.contrib',
]
classifiers = [line.strip() for line in '''\
#Development Status :: 4 - Beta
@@ -30,7 +29,7 @@
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 @@
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
View
@@ -19,7 +19,7 @@
from distutils.command.install_data import install_data
#imports from Cheetah ...
-from src.FileUtils import findFiles
+from cheetah.FileUtils import findFiles
##################################################
## CLASSES ##
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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'
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
No changes.
View
@@ -22,7 +22,10 @@
# 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_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".

0 comments on commit 988f6da

Please sign in to comment.