diff --git a/player/__init__.py b/player/__init__.py
index d858fa7..6fb55ee 100644
--- a/player/__init__.py
+++ b/player/__init__.py
@@ -18,7 +18,7 @@
def includeme(cfg):
- cfg.include('pyramid_jinja2')
+ cfg.include('pyramid_chameleon')
import os
from pyramid.path import AssetResolver
diff --git a/player/templates/message/error.jinja2 b/player/templates/message/error.pt
similarity index 62%
rename from player/templates/message/error.jinja2
rename to player/templates/message/error.pt
index 8b5f2f0..95789a0 100644
--- a/player/templates/message/error.jinja2
+++ b/player/templates/message/error.pt
@@ -1,6 +1,7 @@
-{% for err in errors %}
+
×
- {{err|safe}}
+ ${err}
-{% endfor %}
+
+
diff --git a/player/templates/message/info.jinja2 b/player/templates/message/info.pt
similarity index 81%
rename from player/templates/message/info.jinja2
rename to player/templates/message/info.pt
index 980a607..a214fc1 100644
--- a/player/templates/message/info.jinja2
+++ b/player/templates/message/info.pt
@@ -1,4 +1,4 @@
×
- {{context|safe}}
+ ${context}
diff --git a/player/templates/message/success.jinja2 b/player/templates/message/success.pt
similarity index 82%
rename from player/templates/message/success.jinja2
rename to player/templates/message/success.pt
index af21ccc..b4764f1 100644
--- a/player/templates/message/success.jinja2
+++ b/player/templates/message/success.pt
@@ -1,4 +1,4 @@
×
- {{context|safe}}
+ ${context}
diff --git a/player/templates/message/warning.jinja2 b/player/templates/message/warning.pt
similarity index 82%
rename from player/templates/message/warning.jinja2
rename to player/templates/message/warning.pt
index 1aab727..13a4619 100644
--- a/player/templates/message/warning.jinja2
+++ b/player/templates/message/warning.pt
@@ -1,4 +1,4 @@
×
- {{context|safe}}
+ ${context}
diff --git a/player/tests/bundle/dir1/view.jinja2 b/player/tests/bundle/dir1/view.pt
similarity index 100%
rename from player/tests/bundle/dir1/view.jinja2
rename to player/tests/bundle/dir1/view.pt
diff --git a/player/tests/dir1/actions.jinja2 b/player/tests/dir1/actions.pt
similarity index 100%
rename from player/tests/dir1/actions.jinja2
rename to player/tests/dir1/actions.pt
diff --git a/player/tests/dir1/view.jinja2 b/player/tests/dir1/view.pt
similarity index 100%
rename from player/tests/dir1/view.jinja2
rename to player/tests/dir1/view.pt
diff --git a/player/tests/message/custom.jinja2 b/player/tests/message/custom.jinja2
deleted file mode 100644
index 4438c6b..0000000
--- a/player/tests/message/custom.jinja2
+++ /dev/null
@@ -1 +0,0 @@
-{{context}}
\ No newline at end of file
diff --git a/player/tests/message/custom.pt b/player/tests/message/custom.pt
new file mode 100644
index 0000000..2deaea3
--- /dev/null
+++ b/player/tests/message/custom.pt
@@ -0,0 +1 @@
+${context}
diff --git a/player/tests/test-layout-html.jinja2 b/player/tests/test-layout-html.jinja2
deleted file mode 100644
index e631c2d..0000000
--- a/player/tests/test-layout-html.jinja2
+++ /dev/null
@@ -1 +0,0 @@
-{{content|safe}}
diff --git a/player/tests/test-layout-html.pt b/player/tests/test-layout-html.pt
new file mode 100644
index 0000000..eceea1a
--- /dev/null
+++ b/player/tests/test-layout-html.pt
@@ -0,0 +1 @@
+${structure:content}
diff --git a/player/tests/test-layout.jinja2 b/player/tests/test-layout.jinja2
deleted file mode 100644
index 05a9e4e..0000000
--- a/player/tests/test-layout.jinja2
+++ /dev/null
@@ -1 +0,0 @@
-{{content|safe}}
\ No newline at end of file
diff --git a/player/tests/test-layout.pt b/player/tests/test-layout.pt
new file mode 100644
index 0000000..fba112d
--- /dev/null
+++ b/player/tests/test-layout.pt
@@ -0,0 +1 @@
+${structure:content}
diff --git a/player/tests/test_layout.py b/player/tests/test_layout.py
index d2ae432..7a70cc7 100644
--- a/player/tests/test_layout.py
+++ b/player/tests/test_layout.py
@@ -56,7 +56,7 @@ def __call__(self):
self.config.add_layout(
'test', context=Context,
- renderer='player:tests/test-layout-html.jinja2')
+ renderer='player:tests/test-layout-html.pt')
renderer = LayoutRenderer('test')
res = renderer('View: test', Context(), self.request)
@@ -92,27 +92,27 @@ def test_layout_simple_chain_multi_level(self):
from player.layout_impl import LayoutRenderer
self.config.add_layout(
- 'test', parent='.', renderer='player:tests/test-layout.jinja2')
+ 'test', parent='.', renderer='player:tests/test-layout.pt')
self.config.add_layout(
'', context=Root, parent=None,
- renderer='player:tests/test-layout-html.jinja2')
+ renderer='player:tests/test-layout-html.pt')
root = Root()
context = Context(root)
renderer = LayoutRenderer('test')
res = renderer('View: test', context, self.request)
- self.assertIn('View: test
', text_(res))
+ self.assertIn('View: test
\n', text_(res))
def test_layout_chain_same_layer_id_on_different_levels(self):
from player.layout_impl import LayoutRenderer
self.config.add_layout(
'', context=Context, parent='.',
- renderer='player:tests/test-layout.jinja2')
+ renderer='player:tests/test-layout.pt')
self.config.add_layout(
'', context=Root, parent=None,
- renderer='player:tests/test-layout-html.jinja2')
+ renderer='player:tests/test-layout-html.pt')
root = Root()
context1 = Context2(root)
@@ -120,11 +120,11 @@ def test_layout_chain_same_layer_id_on_different_levels(self):
renderer = LayoutRenderer('')
res = renderer('View: test', context2, self.request)
- self.assertIn('View: test
', text_(res))
+ self.assertIn('View: test
\n', text_(res))
def test_layout_chain_parent_notfound(self):
self.config.add_layout('', context=Context, parent='page',
- renderer='player:tests/test-layout.jinja2')
+ renderer='player:tests/test-layout.pt')
root = Root()
context = Context(root)
@@ -246,7 +246,7 @@ def test_layout_renderer_no_layouts(self, m):
def test_layout_renderer_layout_debug(self):
from player.layout_impl import LayoutRenderer
self.config.add_layout('test', view=View,
- renderer='player:tests/test-layout.jinja2')
+ renderer='player:tests/test-layout.pt')
self.request.__layout_debug__ = True
rendr = LayoutRenderer('test')
@@ -262,10 +262,10 @@ def test_layout_renderer(self, m):
m.choice.return_value = 'red'
self.config.add_layout('test', view=View,
- renderer='player:tests/test-layout.jinja2')
+ renderer='player:tests/test-layout.pt')
self.config.add_view(
name='view.html',
- renderer=player.layout('player:tests/dir1/view.jinja2', 'test'))
+ renderer=player.layout('player:tests/dir1/view.pt', 'test'))
from pyramid.view import render_view_to_response
@@ -284,7 +284,7 @@ def view(request):
self.config.add_view(
name='view.html', view=view, renderer=player.layout())
self.config.add_layout(
- '', view=View, renderer='player:tests/test-layout.jinja2')
+ '', view=View, renderer='player:tests/test-layout.pt')
res = render_view_to_response(Context(), self.request, 'view.html')
self.assertEqual('test
', res.text.strip())
@@ -300,7 +300,7 @@ def view(request):
self.config.add_view(
name='view.html', renderer=player.layout())
self.config.add_layout(
- '', view=view, renderer='player:tests/test-layout.jinja2')
+ '', view=view, renderer='player:tests/test-layout.pt')
res = render_view_to_response(Context(), self.request, 'view.html')
self.assertIsInstance(res, HTTPFound)
diff --git a/player/tests/test_message.py b/player/tests/test_message.py
index dfe7add..a8813ca 100644
--- a/player/tests/test_message.py
+++ b/player/tests/test_message.py
@@ -12,7 +12,7 @@ class TestStatusMessages(BaseTestCase):
def test_messages_addmessage(self):
add_message(self.request, 'message')
- res = render_messages(self.request)
+ res = render_messages(self.request).strip()
self.assertEqual(
res,
@@ -22,7 +22,7 @@ def test_messages_warning_msg(self):
add_message(self.request, 'warning', 'warning')
self.assertEqual(
- render_messages(self.request),
+ render_messages(self.request).strip(),
text_('','utf-8'))
def test_messages_error_msg(self):
@@ -78,7 +78,7 @@ def test_messages_render(self):
add_message(self.request, 'message')
self.assertEqual(
- render_messages(self.request),
+ render_messages(self.request).strip(),
text_('','utf-8'))
msg = render_messages(self.request)
@@ -98,7 +98,7 @@ def test_messages_request_attr(self):
req = self.make_request()
req.add_message('message')
- res = req.render_messages()
+ res = req.render_messages().strip()
self.assertEqual(
res,
diff --git a/player/tests/test_renderer.py b/player/tests/test_renderer.py
index 4b0b084..36b4113 100644
--- a/player/tests/test_renderer.py
+++ b/player/tests/test_renderer.py
@@ -105,5 +105,5 @@ def test_render_standard(self):
It is possible to use standard renderers as asset var
"""
text = player.render(
- self.request, 'player:tests/dir1/view.jinja2')
+ self.request, 'player:tests/dir1/view.pt')
self.assertEqual(text, 'Test
')
diff --git a/player/tests/test_script.py b/player/tests/test_script.py
index 6664e2e..3ee5bcc 100644
--- a/player/tests/test_script.py
+++ b/player/tests/test_script.py
@@ -100,7 +100,7 @@ def test(): pass
val = self.out.getvalue()
self.assertIn('* Layer: test1', val)
self.assertIn('player:tests/dir1/', val)
- self.assertIn('actions: .jinja2 (test_script.py: test)', val)
+ self.assertIn('actions: .pt (test_script.py: test)', val)
self.assertIn('* Layer: test2', val)
@mock.patch('player.script.bootstrap')
@@ -118,7 +118,7 @@ def test_list_templates_limit(self, m_bs):
val = self.out.getvalue()
self.assertIn('* Layer: test1', val)
self.assertIn('player:tests/dir1/', val)
- self.assertIn('actions: .jinja2', val)
+ self.assertIn('actions: .pt', val)
self.assertNotIn('* Layer: test2', val)
@mock.patch('player.script.bootstrap')
@@ -193,4 +193,4 @@ def test_customize_success(self, m_bs):
layer.main()
- self.assertTrue(os.path.join(self.dir, 'view.jinja2'))
+ self.assertTrue(os.path.join(self.dir, 'view.pt'))
diff --git a/setup.py b/setup.py
index c57bf31..4724355 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
install_requires = ['setuptools',
'pyramid >= 1.4',
- 'pyramid_jinja2',
+ 'pyramid_chameleon',
]
if sys.version_info[:2] == (2, 6):