summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-08-10 14:30:00 -0400
committerChris McDonough <chrism@plope.com>2011-08-10 14:30:00 -0400
commit1939d00839e805f44680512b7952f4c1aff32a7c (patch)
tree2f7eb385229e8c59bf6613bd246f8c0f5cf04892
parent0818584847df63dbbe88ac5d1447ffbbb820eb08 (diff)
downloadpyramid-1939d00839e805f44680512b7952f4c1aff32a7c.tar.gz
pyramid-1939d00839e805f44680512b7952f4c1aff32a7c.tar.bz2
pyramid-1939d00839e805f44680512b7952f4c1aff32a7c.zip
- Fixed an issue with the default renderer not working at certain times. See
https://github.com/Pylons/pyramid/issues/249 Closes #249.
-rw-r--r--CHANGES.txt6
-rw-r--r--pyramid/renderers.py3
-rw-r--r--pyramid/tests/test_renderers.py7
3 files changed, 15 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 87b8ca53f..208662150 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -75,6 +75,12 @@ Documentation
- Added a "Displaying Tweens" section to the "Command-Line Pyramid" narrative
chapter.
+Bug Fixes
+---------
+
+- Fixed an issue with the default renderer not working at certain times. See
+ https://github.com/Pylons/pyramid/issues/249
+
1.1 (2011-07-22)
================
diff --git a/pyramid/renderers.py b/pyramid/renderers.py
index a06067c97..dce6de140 100644
--- a/pyramid/renderers.py
+++ b/pyramid/renderers.py
@@ -354,7 +354,8 @@ class RendererHelper(object):
if name and '.' in name:
rtype = os.path.splitext(name)[1]
else:
- rtype = name
+ # important.. must be a string; cannot be None; see issue 249
+ rtype = name or ''
if registry is None:
registry = get_current_registry()
diff --git a/pyramid/tests/test_renderers.py b/pyramid/tests/test_renderers.py
index cc36d69bf..b5c5d1242 100644
--- a/pyramid/tests/test_renderers.py
+++ b/pyramid/tests/test_renderers.py
@@ -486,6 +486,13 @@ class TestRendererHelper(unittest.TestCase):
helper = self._makeOne(registry=Dummy)
self.assertEqual(helper.settings, {})
+ def test_settings_registry_name_is_None(self):
+ class Dummy(object):
+ settings = None
+ helper = self._makeOne(registry=Dummy)
+ self.assertEqual(helper.name, None)
+ self.assertEqual(helper.type, '')
+
def test_settings_registry_settings_is_not_None(self):
class Dummy(object):
settings = {'a':1}