Changeset 5146

Timestamp:

08/14/08 11:20:34 (5 months ago)

Author:

splee

Message:

* Added ability to set a custom content type directly to pylons.response.headers within a controller method without it being overridden by tg (#1923)
* Prevents addition of charset=utf8 to the content type if the type is not text/* or application/json (#1923)

Files:

• trunk/tg/controllers.py (modified) (2 diffs)
• trunk/tg/decorators.py (modified) (1 diff)
• trunk/tg/tests/test_tg_controller_dispatch.py (modified) (3 diffs)

trunk/tg/controllers.py

@@ -29 +29 @@
-
-log = logging.getLogger(__name__)
+
+# If someone goes @expose(content_type=CUSTOM_CONTENT_TYPE) then we won't override pylons.request.content_type
+CUSTOM_CONTENT_TYPE = 'CUSTOM/LEAVE'
-
-def _configured_engines():
@@ -207 +210 @@
-            controller.decoration.lookup_template_engine(pylons.request)
-
-# Always set content type
-
+if content_type != CUSTOM_CONTENT_TYPE:
+    
-        # Save these objeccts as locals from the SOP to avoid expensive lookups
-        req = pylons.request._current_obj()

trunk/tg/decorators.py

@@ -71 +71 @@
-        engine, template, exclude_names = self.engines[content_type]
-        
-
+
+
-            content_type = '%s; charset=utf-8' % content_type
-        

trunk/tg/tests/test_tg_controller_dispatch.py

@@ -2 +2 @@
-
-import tg, pylons
-
+, CUSTOM_CONTENT_TYPE
-from tg.decorators import expose, validate
-from routes import Mapper
@@ -123 +123 @@
-        return dict(got_json=True)
-        
+    @expose(content_type=CUSTOM_CONTENT_TYPE)
+    def custom_content_type(self):
+        pylons.response.headers['content-type'] = 'image/png'
+        return 'PNG'
+
+
-class TestTGController(TestWSGIController):
-    def __init__(self, *args, **kargs):
@@ -214 +220 @@
-        assert '{"got_json' in resp.body
-
+    def test_custom_content_type(self):
+        resp = self.app.get('/custom_content_type')
+        self.assertEqual('image/png', dict(resp.headers)['content-type'])
+        assert resp.body == 'PNG'
+