maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Some small cleanup

Browse source
This commit is contained in:
Armin Ronacher 2013-06-07 00:56:21 +01:00
parent 62dbe0e1ca
commit 94c6ae51d7
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
flask/app.py
View file

@ -34,7 +34,7 @@ from .templating import DispatchingJinjaLoader, Environment, \
_default_template_ctx_processor _default_template_ctx_processor
from .signals import request_started, request_finished, got_request_exception, \ from .signals import request_started, request_finished, got_request_exception, \
request_tearing_down, appcontext_tearing_down request_tearing_down, appcontext_tearing_down
from ._compat import reraise, string_types, integer_types from ._compat import reraise, string_types, text_type, integer_types
# a lock used for logger initialization # a lock used for logger initialization
_logger_lock = Lock() _logger_lock = Lock()
@ -1572,7 +1572,7 @@ class Flask(_PackageBoundObject):
# set the headers and status. We do this because there can be # set the headers and status. We do this because there can be
# some extra logic involved when creating these objects with # some extra logic involved when creating these objects with
# specific values (like default content type selection). # specific values (like default content type selection).
if isinstance(rv, string_types + (bytes, )): if isinstance(rv, (text_type, bytes, bytearray)):
rv = self.response_class(rv, headers=headers, status=status) rv = self.response_class(rv, headers=headers, status=status)
headers = status = None headers = status = None
else: else: