summaryrefslogtreecommitdiff
path: root/pecan/core.py
diff options
context:
space:
mode:
authorRyan Petrello <lists@ryanpetrello.com>2013-05-03 14:13:59 -0400
committerRyan Petrello <lists@ryanpetrello.com>2013-05-03 14:13:59 -0400
commitf3c301984ca5f161f4cc6d98d0910ec1f98e4252 (patch)
treead81b3bb300ae53ed1a10e0e367c7b6cdfadede1 /pecan/core.py
parent9ce0a79866fc4aee0b0988b5b75ce2432c97d0ee (diff)
downloadpecan-f3c301984ca5f161f4cc6d98d0910ec1f98e4252.tar.gz
Remove a hard-coded UTF-8 assumption.
Diffstat (limited to 'pecan/core.py')
-rw-r--r--pecan/core.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/pecan/core.py b/pecan/core.py
index 6820fab..c09763d 100644
--- a/pecan/core.py
+++ b/pecan/core.py
@@ -528,13 +528,7 @@ class Pecan(object):
testing_variables['controller_output'] = result
# set the body content
- if six.PY3:
- resp.text = result if isinstance(result, str) else str(
- result,
- 'utf-8',
- 'strict'
- )
- elif isinstance(result, six.text_type):
+ if isinstance(result, six.text_type):
resp.text = result
else:
resp.body = result