diff options
| author | Chris McDonough <chrism@plope.com> | 2012-09-19 05:44:15 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-09-19 05:44:15 -0400 |
| commit | 246c13ed4366d3e3869185919ea1877fe23fe1ff (patch) | |
| tree | eef04947debe1ace0d916974cb0ac3dab405cb24 | |
| parent | 80cd0b1ab6b97c99863db045a2dda984e006c3b9 (diff) | |
| parent | 1c7724e5484c65257f18b542662d5e1a1115c9f0 (diff) | |
| download | pyramid-246c13ed4366d3e3869185919ea1877fe23fe1ff.tar.gz pyramid-246c13ed4366d3e3869185919ea1877fe23fe1ff.tar.bz2 pyramid-246c13ed4366d3e3869185919ea1877fe23fe1ff.zip | |
Merge branch 'master' into 1.4-branch
| -rw-r--r-- | pyramid/chameleon_text.py | 5 | ||||
| -rw-r--r-- | pyramid/chameleon_zpt.py | 5 | ||||
| -rw-r--r-- | pyramid/tests/test_config/test_init.py | 11 |
3 files changed, 6 insertions, 15 deletions
diff --git a/pyramid/chameleon_text.py b/pyramid/chameleon_text.py index 21dc85528..8cf04bf79 100644 --- a/pyramid/chameleon_text.py +++ b/pyramid/chameleon_text.py @@ -1,5 +1,3 @@ -import sys - from zope.interface import implementer from chameleon.zpt.template import PageTextTemplateFile @@ -22,9 +20,6 @@ class TextTemplateRenderer(object): @reify # avoid looking up reload_templates before manager pushed def template(self): - if sys.platform.startswith('java'): # pragma: no cover - raise RuntimeError( - 'Chameleon templates are not compatible with Jython') return PageTextTemplateFile(self.path, auto_reload=self.lookup.auto_reload, debug=self.lookup.debug, diff --git a/pyramid/chameleon_zpt.py b/pyramid/chameleon_zpt.py index 862e996b9..73203a7cb 100644 --- a/pyramid/chameleon_zpt.py +++ b/pyramid/chameleon_zpt.py @@ -1,5 +1,3 @@ -import sys - from zope.interface import implementer from chameleon.zpt.template import PageTemplateFile @@ -20,9 +18,6 @@ class ZPTTemplateRenderer(object): @reify # avoid looking up reload_templates before manager pushed def template(self): - if sys.platform.startswith('java'): # pragma: no cover - raise RuntimeError( - 'Chameleon templates are not compatible with Jython') tf = PageTemplateFile(self.path, auto_reload=self.lookup.auto_reload, debug=self.lookup.debug, diff --git a/pyramid/tests/test_config/test_init.py b/pyramid/tests/test_config/test_init.py index f39906dd9..2cf9a269a 100644 --- a/pyramid/tests/test_config/test_init.py +++ b/pyramid/tests/test_config/test_init.py @@ -923,12 +923,13 @@ pyramid.tests.test_config.dummy_include2""", result = render_view_to_response(ctx, req, 'another_stacked_class2') self.assertEqual(result, 'another_stacked_class') - if not os.name.startswith('java'): - # on Jython, a class without an __init__ apparently accepts - # any number of arguments without raising a TypeError. + # NB: on Jython, a class without an __init__ apparently accepts + # any number of arguments without raising a TypeError, so the next + # assertion may fail there. We don't support Jython at the moment, + # this is just a note to a future self. - self.assertRaises(TypeError, - render_view_to_response, ctx, req, 'basemethod') + self.assertRaises(TypeError, + render_view_to_response, ctx, req, 'basemethod') result = render_view_to_response(ctx, req, 'method1') self.assertEqual(result, 'method1') |