|
Luke Macken |
7d9a2bd |
diff -Naur TurboGears2-2.3.0dev.orig/setup.py TurboGears2-2.3.0dev/setup.py
|
|
Luke Macken |
7d9a2bd |
--- TurboGears2-2.3.0dev.orig/setup.py 2013-04-03 13:56:25.379430738 -0400
|
|
Luke Macken |
7d9a2bd |
+++ TurboGears2-2.3.0dev/setup.py 2013-04-03 13:56:32.489528286 -0400
|
|
Luke Macken |
7d9a2bd |
@@ -31,7 +31,6 @@
|
|
Luke Macken |
7d9a2bd |
if py_version[0] == 2:
|
|
Luke Macken |
7d9a2bd |
test_requirements.extend(['TurboKid >= 1.0.4',
|
|
Luke Macken |
7d9a2bd |
'Kajiki >= 0.2.2',
|
|
Luke Macken |
7d9a2bd |
- 'Chameleon < 2.0a',
|
|
Luke Macken |
7d9a2bd |
'simplegeneric',
|
|
Luke Macken |
7d9a2bd |
'Formencode',
|
|
Luke Macken |
7d9a2bd |
'routes',
|
|
Luke Macken |
7d9a2bd |
diff -Naur TurboGears2-2.3.0dev.orig/tests/test_configuration.py TurboGears2-2.3.0dev/tests/test_configuration.py
|
|
Luke Macken |
7d9a2bd |
--- TurboGears2-2.3.0dev.orig/tests/test_configuration.py 2013-04-03 13:56:25.378430724 -0400
|
|
Luke Macken |
7d9a2bd |
+++ TurboGears2-2.3.0dev/tests/test_configuration.py 2013-04-03 13:57:20.414184664 -0400
|
|
Luke Macken |
7d9a2bd |
@@ -217,12 +217,6 @@
|
|
Luke Macken |
0616fc8 |
def test_setup_sa_auth_backend(self):
|
|
Luke Macken |
0616fc8 |
self.config.setup_sa_auth_backend()
|
|
Luke Macken |
0616fc8 |
|
|
Luke Macken |
0616fc8 |
- def test_setup_chameleon_genshi_renderer(self):
|
|
Luke Macken |
7d9a2bd |
- if PY3: raise SkipTest()
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
0616fc8 |
- self.config.paths.templates = 'template_path'
|
|
Luke Macken |
0616fc8 |
- self.config.setup_chameleon_genshi_renderer()
|
|
Luke Macken |
0616fc8 |
-
|
|
Luke Macken |
7d9a2bd |
def test_setup_kajiki_renderer(self):
|
|
Luke Macken |
7d9a2bd |
if PY3: raise SkipTest()
|
|
Luke Macken |
7d9a2bd |
|
|
Luke Macken |
7d9a2bd |
@@ -910,4 +904,4 @@
|
|
Luke Macken |
7d9a2bd |
conf = AppConfig(minimal=True, root_controller=RootController())
|
|
Luke Macken |
7d9a2bd |
conf.package = sys.modules[__name__]
|
|
Luke Macken |
7d9a2bd |
|
|
Luke Macken |
7d9a2bd |
- app = conf.make_wsgi_app()
|
|
Luke Macken |
7d9a2bd |
\ No newline at end of file
|
|
Luke Macken |
7d9a2bd |
+ app = conf.make_wsgi_app()
|
|
Luke Macken |
7d9a2bd |
diff -Naur TurboGears2-2.3.0dev.orig/tests/test_stack/__init__.py TurboGears2-2.3.0dev/tests/test_stack/__init__.py
|
|
Luke Macken |
7d9a2bd |
--- TurboGears2-2.3.0dev.orig/tests/test_stack/__init__.py 2013-04-03 13:56:25.374430669 -0400
|
|
Luke Macken |
7d9a2bd |
+++ TurboGears2-2.3.0dev/tests/test_stack/__init__.py 2013-04-03 13:57:38.053425778 -0400
|
|
Luke Macken |
7d9a2bd |
@@ -16,7 +16,7 @@
|
|
Luke Macken |
0616fc8 |
#First we setup some base values that we know will work
|
|
Luke Macken |
7d9a2bd |
self.renderers = ['genshi', 'mako', 'jinja','json']
|
|
Luke Macken |
7d9a2bd |
if not PY3:
|
|
Luke Macken |
7d9a2bd |
- self.renderers.extend(['chameleon_genshi', 'kajiki'])
|
|
Luke Macken |
7d9a2bd |
+ self.renderers.extend(['kajiki'])
|
|
Luke Macken |
7d9a2bd |
|
|
Luke Macken |
0616fc8 |
self.render_functions = tg.util.Bunch()
|
|
Luke Macken |
0616fc8 |
self.package = tests.test_stack
|
|
Luke Macken |
7d9a2bd |
diff -Naur TurboGears2-2.3.0dev.orig/tests/test_stack/rendering/controllers/root.py TurboGears2-2.3.0dev/tests/test_stack/rendering/controllers/root.py
|
|
Luke Macken |
7d9a2bd |
--- TurboGears2-2.3.0dev.orig/tests/test_stack/rendering/controllers/root.py 2013-04-03 13:56:25.376430697 -0400
|
|
Luke Macken |
7d9a2bd |
+++ TurboGears2-2.3.0dev/tests/test_stack/rendering/controllers/root.py 2013-04-03 14:01:17.829412104 -0400
|
|
Luke Macken |
7d9a2bd |
@@ -261,14 +261,6 @@
|
|
Luke Macken |
7d9a2bd |
i18n.set_temporary_lang("de")
|
|
Luke Macken |
7d9a2bd |
return {}
|
|
Luke Macken |
7d9a2bd |
|
|
Luke Macken |
7d9a2bd |
- @expose('chameleon_genshi:index.html')
|
|
Luke Macken |
7d9a2bd |
- def chameleon_genshi_index(self):
|
|
Luke Macken |
7d9a2bd |
- return {}
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
- @expose('chameleon_genshi:genshi_inherits.html')
|
|
Luke Macken |
7d9a2bd |
- def chameleon_genshi_inherits(self):
|
|
Luke Macken |
7d9a2bd |
- return {}
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
@expose('mako:mako_noop.mak')
|
|
Luke Macken |
7d9a2bd |
def mako_index(self):
|
|
Luke Macken |
7d9a2bd |
return {}
|
|
Luke Macken |
7d9a2bd |
@@ -277,10 +269,6 @@
|
|
Luke Macken |
7d9a2bd |
def mako_inherits(self):
|
|
Luke Macken |
7d9a2bd |
return {}
|
|
Luke Macken |
7d9a2bd |
|
|
Luke Macken |
7d9a2bd |
- @expose('chameleon_genshi:tests.test_stack.rendering.templates.index')
|
|
Luke Macken |
7d9a2bd |
- def chameleon_index_dotted(self):
|
|
Luke Macken |
7d9a2bd |
- return {}
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
@expose('kajiki:tests.test_stack.rendering.templates.index')
|
|
Luke Macken |
7d9a2bd |
def kajiki_index_dotted(self):
|
|
Luke Macken |
7d9a2bd |
return {}
|
|
Luke Macken |
7d9a2bd |
diff -Naur TurboGears2-2.3.0dev.orig/tests/test_stack/rendering/test_dotted_rendering.py TurboGears2-2.3.0dev/tests/test_stack/rendering/test_dotted_rendering.py
|
|
Luke Macken |
7d9a2bd |
--- TurboGears2-2.3.0dev.orig/tests/test_stack/rendering/test_dotted_rendering.py 2013-04-03 13:56:25.375430683 -0400
|
|
Luke Macken |
7d9a2bd |
+++ TurboGears2-2.3.0dev/tests/test_stack/rendering/test_dotted_rendering.py 2013-04-03 13:58:32.815172826 -0400
|
|
Luke Macken |
7d9a2bd |
@@ -19,14 +19,6 @@
|
|
Luke Macken |
0616fc8 |
)
|
|
Luke Macken |
0616fc8 |
return app_from_config(base_config)
|
|
Luke Macken |
0616fc8 |
|
|
Luke Macken |
0616fc8 |
-def test_default_chameleon_genshi_renderer():
|
|
Luke Macken |
7d9a2bd |
- if PY3: raise SkipTest()
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
0616fc8 |
- app = setup_noDB()
|
|
Luke Macken |
0616fc8 |
- resp = app.get('/chameleon_index_dotted')
|
|
Luke Macken |
0616fc8 |
- assert "Welcome" in resp, resp
|
|
Luke Macken |
0616fc8 |
- assert "TurboGears" in resp, resp
|
|
Luke Macken |
0616fc8 |
-
|
|
Luke Macken |
7d9a2bd |
def test_default_kajiki_renderer():
|
|
Luke Macken |
7d9a2bd |
if PY3: raise SkipTest()
|
|
Luke Macken |
7d9a2bd |
|
|
Luke Macken |
7d9a2bd |
diff -Naur TurboGears2-2.3.0dev.orig/tests/test_stack/rendering/test_rendering.py TurboGears2-2.3.0dev/tests/test_stack/rendering/test_rendering.py
|
|
Luke Macken |
7d9a2bd |
--- TurboGears2-2.3.0dev.orig/tests/test_stack/rendering/test_rendering.py 2013-04-03 13:56:25.375430683 -0400
|
|
Luke Macken |
7d9a2bd |
+++ TurboGears2-2.3.0dev/tests/test_stack/rendering/test_rendering.py 2013-04-03 13:59:11.121694138 -0400
|
|
Luke Macken |
7d9a2bd |
@@ -256,38 +256,6 @@
|
|
Luke Macken |
0616fc8 |
assert "from sub-template: sub.frombottom" in resp
|
|
Luke Macken |
0616fc8 |
assert "Master template" in resp
|
|
Luke Macken |
0616fc8 |
|
|
Luke Macken |
0616fc8 |
-def test_chameleon_genshi_base():
|
|
Luke Macken |
7d9a2bd |
- if PY3: raise SkipTest()
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
0616fc8 |
- app = setup_noDB()
|
|
Luke Macken |
0616fc8 |
- resp = app.get('/chameleon_genshi_index')
|
|
Luke Macken |
0616fc8 |
- assert ("TurboGears 2 is rapid web application development toolkit"
|
|
Luke Macken |
0616fc8 |
- " designed to make your life easier.") in resp
|
|
Luke Macken |
0616fc8 |
-
|
|
Luke Macken |
0616fc8 |
-def test_chameleon_genshi_inheritance():
|
|
Luke Macken |
7d9a2bd |
- if PY3: raise SkipTest()
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
0616fc8 |
- try:
|
|
Luke Macken |
0616fc8 |
- import lxml
|
|
Luke Macken |
0616fc8 |
- except ImportError:
|
|
Luke Macken |
0616fc8 |
- # match templates need lxml, but since they don're really work anyway
|
|
Luke Macken |
0616fc8 |
- # (at least not fully compatible with Genshi), we just skip this test
|
|
Luke Macken |
0616fc8 |
- return
|
|
Luke Macken |
0616fc8 |
- app = setup_noDB()
|
|
Luke Macken |
0616fc8 |
- try:
|
|
Luke Macken |
0616fc8 |
- resp = app.get('/chameleon_genshi_inherits')
|
|
Luke Macken |
7d9a2bd |
- except NameError as e:
|
|
Luke Macken |
0616fc8 |
- # known issue with chameleon.genshi 1.0
|
|
Luke Macken |
0616fc8 |
- if 'match_templates' not in str(e):
|
|
Luke Macken |
0616fc8 |
- raise
|
|
Luke Macken |
7d9a2bd |
- except AttributeError as e:
|
|
Luke Macken |
0616fc8 |
- # known issue with chameleon.genshi 1.3
|
|
Luke Macken |
0616fc8 |
- if 'XPathResult' not in str(e):
|
|
Luke Macken |
0616fc8 |
- raise
|
|
Luke Macken |
0616fc8 |
- else:
|
|
Luke Macken |
0616fc8 |
- assert "Inheritance template" in resp
|
|
Luke Macken |
0616fc8 |
- assert "Master template" in resp
|
|
Luke Macken |
0616fc8 |
-
|
|
Luke Macken |
7d9a2bd |
def test_jinja_autoload():
|
|
Luke Macken |
0616fc8 |
app = setup_noDB()
|
|
Luke Macken |
7d9a2bd |
resp = app.get('/jinja_autoload', status=500)
|
|
Luke Macken |
7d9a2bd |
diff -Naur TurboGears2-2.3.0dev.orig/tg/configuration/app_config.py TurboGears2-2.3.0dev/tg/configuration/app_config.py
|
|
Luke Macken |
7d9a2bd |
--- TurboGears2-2.3.0dev.orig/tg/configuration/app_config.py 2013-04-03 13:56:25.365430546 -0400
|
|
Luke Macken |
7d9a2bd |
+++ TurboGears2-2.3.0dev/tg/configuration/app_config.py 2013-04-03 14:00:22.104657686 -0400
|
|
Luke Macken |
7d9a2bd |
@@ -512,25 +512,6 @@
|
|
Luke Macken |
7d9a2bd |
|
|
Luke Macken |
7d9a2bd |
self.render_functions.mako = render_mako
|
|
Luke Macken |
7d9a2bd |
|
|
Luke Macken |
7d9a2bd |
- def setup_chameleon_genshi_renderer(self): #pragma: no cover
|
|
Luke Macken |
7d9a2bd |
- """Setup a renderer and loader for the chameleon.genshi engine."""
|
|
Luke Macken |
7d9a2bd |
- from tg.render import RenderChameleonGenshi
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
- try:
|
|
Luke Macken |
7d9a2bd |
- import chameleon.genshi.loader
|
|
Luke Macken |
7d9a2bd |
- except ImportError:
|
|
Luke Macken |
7d9a2bd |
- return False
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
- if config.get('use_dotted_templatenames', True):
|
|
Luke Macken |
7d9a2bd |
- from tg.dottednames.chameleon_genshi_lookup \
|
|
Luke Macken |
7d9a2bd |
- import ChameleonGenshiTemplateLoader as TemplateLoader
|
|
Luke Macken |
7d9a2bd |
- else:
|
|
Luke Macken |
7d9a2bd |
- from chameleon.genshi.loader import TemplateLoader
|
|
Luke Macken |
7d9a2bd |
- loader = TemplateLoader(search_path=self.paths.templates,
|
|
Luke Macken |
7d9a2bd |
- auto_reload=self.auto_reload_templates)
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
- self.render_functions.chameleon_genshi = RenderChameleonGenshi(loader)
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
def setup_genshi_renderer(self):
|
|
Luke Macken |
7d9a2bd |
"""Setup a renderer and loader for Genshi templates.
|
|
Luke Macken |
7d9a2bd |
|
|
Luke Macken |
7d9a2bd |
diff -Naur TurboGears2-2.3.0dev.orig/tg/dottednames/chameleon_genshi_lookup.py TurboGears2-2.3.0dev/tg/dottednames/chameleon_genshi_lookup.py
|
|
Luke Macken |
7d9a2bd |
--- TurboGears2-2.3.0dev.orig/tg/dottednames/chameleon_genshi_lookup.py 2013-04-03 13:56:25.369430600 -0400
|
|
Luke Macken |
7d9a2bd |
+++ TurboGears2-2.3.0dev/tg/dottednames/chameleon_genshi_lookup.py 1969-12-31 19:00:00.000000000 -0500
|
|
Luke Macken |
7d9a2bd |
@@ -1,29 +0,0 @@
|
|
Luke Macken |
7d9a2bd |
-"""Chameleon.Genshi template loader that supports dotted names."""
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
-from chameleon.genshi.loader import TemplateLoader
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
-from tg import config
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
-class ChameleonGenshiTemplateLoader(TemplateLoader):
|
|
Luke Macken |
7d9a2bd |
- """Chameleon.Genshi template loader supporting dotted filenames.
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
- Supports zipped applications and dotted filenames as well as path names.
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
- """
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
- template_extension = '.html'
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
- def get_dotted_filename(self, filename):
|
|
Luke Macken |
7d9a2bd |
- if not filename.endswith(self.template_extension):
|
|
Luke Macken |
7d9a2bd |
- finder = config['tg.app_globals'].dotted_filename_finder
|
|
Luke Macken |
7d9a2bd |
- filename = finder.get_dotted_filename(
|
|
Luke Macken |
7d9a2bd |
- template_name=filename,
|
|
Luke Macken |
7d9a2bd |
- template_extension=self.template_extension)
|
|
Luke Macken |
7d9a2bd |
- return filename
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
- def load(self, filename, format='xml'):
|
|
Luke Macken |
7d9a2bd |
- """Actual loader function."""
|
|
Luke Macken |
7d9a2bd |
- return TemplateLoader.load(
|
|
Luke Macken |
7d9a2bd |
- self, self.get_dotted_filename(filename), format)
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
diff -Naur TurboGears2-2.3.0dev.orig/tg/render.py TurboGears2-2.3.0dev/tg/render.py
|
|
Luke Macken |
7d9a2bd |
--- TurboGears2-2.3.0dev.orig/tg/render.py 2013-04-03 13:56:25.367430573 -0400
|
|
Luke Macken |
7d9a2bd |
+++ TurboGears2-2.3.0dev/tg/render.py 2013-04-03 14:00:45.032968298 -0400
|
|
Luke Macken |
7d9a2bd |
@@ -222,47 +222,6 @@
|
|
Luke Macken |
7d9a2bd |
return render_func()
|
|
Luke Macken |
7d9a2bd |
|
|
Luke Macken |
7d9a2bd |
|
|
Luke Macken |
7d9a2bd |
-class RenderChameleonGenshi(object): #pragma: no cover
|
|
Luke Macken |
7d9a2bd |
- """Singleton that can be called as the Chameleon-Genshi render function."""
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
- format_for_content_type = {
|
|
Luke Macken |
7d9a2bd |
- 'text/plain': 'text',
|
|
Luke Macken |
7d9a2bd |
- 'text/css': 'text',
|
|
Luke Macken |
7d9a2bd |
- 'text/html': 'xml',
|
|
Luke Macken |
7d9a2bd |
- 'text/xml': 'xml',
|
|
Luke Macken |
7d9a2bd |
- 'application/xml': 'xml',
|
|
Luke Macken |
7d9a2bd |
- 'application/xhtml+xml': 'xml',
|
|
Luke Macken |
7d9a2bd |
- 'application/atom+xml': 'xml',
|
|
Luke Macken |
7d9a2bd |
- 'application/rss+xml': 'xml',
|
|
Luke Macken |
7d9a2bd |
- 'application/soap+xml': 'xml',
|
|
Luke Macken |
7d9a2bd |
- 'image/svg+xml': 'xml'}
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
- def __init__(self, loader):
|
|
Luke Macken |
7d9a2bd |
- self.load_template = loader.load
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
- def __call__(self, template_name, template_vars, **kwargs):
|
|
Luke Macken |
7d9a2bd |
- """Render the template_vars with the Chameleon-Genshi template."""
|
|
Luke Macken |
7d9a2bd |
- config = tg.config._current_obj()
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
- # Gets template format from content type or from config options
|
|
Luke Macken |
7d9a2bd |
- format = kwargs.get('format')
|
|
Luke Macken |
7d9a2bd |
- if not format:
|
|
Luke Macken |
7d9a2bd |
- format = self.format_for_content_type.get(tg.response.content_type)
|
|
Luke Macken |
7d9a2bd |
- if not format:
|
|
Luke Macken |
7d9a2bd |
- format = config.get('templating.chameleon.genshi.format')
|
|
Luke Macken |
7d9a2bd |
- if not format:
|
|
Luke Macken |
7d9a2bd |
- format = config.get('templating.genshi.method')
|
|
Luke Macken |
7d9a2bd |
- if not format or format not in ('xml', 'text'):
|
|
Luke Macken |
7d9a2bd |
- format = 'xml'
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
- def render_template():
|
|
Luke Macken |
7d9a2bd |
- template = self.load_template(template_name, format=format)
|
|
Luke Macken |
7d9a2bd |
- return Markup(template.render(**template_vars))
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
- return cached_template(template_name, render_template,
|
|
Luke Macken |
7d9a2bd |
- ns_options=('doctype', 'method'), **kwargs)
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
-
|
|
Luke Macken |
7d9a2bd |
class RenderGenshi(object):
|
|
Luke Macken |
7d9a2bd |
"""Singleton that can be called as the Genshi render function."""
|
|
Luke Macken |
7d9a2bd |
|