stackforge/pecan
Code Issues Proposed changes

Merge "Refactor 204 handling."

Browse Source
This commit is contained in:
Jenkins
2014-08-27 20:55:38 +00:00
committed by Gerrit Code Review
parent 078a0dd093 489afb7819
commit 5d1f3915e8
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pecan/core.py
View File

@@ -571,33 +571,37 @@ class PecanBase(object):
resp.text = result resp.text = result
elif result: elif result:
resp.body = result resp.body = result
elif response.status_int == 200:
if pecan_state['content_type']:
# set the content type
resp.content_type = pecan_state['content_type']
def _handle_empty_response_body(self, state):
# Enforce HTTP 204 for responses which contain no body
if state.response.status_int == 200:
# If the response is a generator... # If the response is a generator...
if isinstance(response.app_iter, types.GeneratorType): if isinstance(state.response.app_iter, types.GeneratorType):
# Split the generator into two so we can peek at one of them # Split the generator into two so we can peek at one of them
# and determine if there is any response body content # and determine if there is any response body content
a, b = tee(response.app_iter) a, b = tee(state.response.app_iter)
try: try:
next(a) next(a)
except StopIteration: except StopIteration:
# If we hit StopIteration, the body is empty # If we hit StopIteration, the body is empty
resp.status = 204 state.response.status = 204
finally: finally:
resp.app_iter = b state.response.app_iter = b
else: else:
text = None text = None
if response.charset: if state.response.charset:
# `response.text` cannot be accessed without a charset # `response.text` cannot be accessed without a charset
# (because we don't know which encoding to use) # (because we don't know which encoding to use)
text = response.text text = state.response.text
if not any((response.body, text)): if not any((state.response.body, text)):
resp.status = 204 state.response.status = 204
if resp.status_int in (204, 304): if state.response.status_int in (204, 304):
resp.content_type = None state.response.content_type = None
elif pecan_state['content_type']:
# set the content type
resp.content_type = pecan_state['content_type']
def __call__(self, environ, start_response): def __call__(self, environ, start_response):
''' '''
@@ -668,6 +672,8 @@ class PecanBase(object):
self.determine_hooks(state.controller), 'after', state self.determine_hooks(state.controller), 'after', state
) )
self._handle_empty_response_body(state)
# get the response # get the response
return state.response(environ, start_response) return state.response(environ, start_response)