summaryrefslogtreecommitdiff
path: root/swift/common/middleware/catch_errors.py
diff options
context:
space:
mode:
authorSamuel Merritt <sam@swiftstack.com>2018-06-21 17:23:41 -0700
committerSamuel Merritt <sam@swiftstack.com>2018-06-21 17:23:41 -0700
commit3920b88daaaa6c9c819b604f2094305e507a41cf (patch)
tree7fd29c1659b4095d673f4c4318868eac6ac794a2 /swift/common/middleware/catch_errors.py
parente0b4eb225ca1375dc3d3498b3e51bcf3e01a39bc (diff)
downloadswift-3920b88daaaa6c9c819b604f2094305e507a41cf.tar.gz
py3: port catch_errors
Today's diff is brought to you by the letter "b". Change-Id: I074c1ff3f1232a899c101f2856dff4a881a6fe77
Diffstat (limited to 'swift/common/middleware/catch_errors.py')
-rw-r--r--swift/common/middleware/catch_errors.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/swift/common/middleware/catch_errors.py b/swift/common/middleware/catch_errors.py
index 6e9334795..a1cc4a4a5 100644
--- a/swift/common/middleware/catch_errors.py
+++ b/swift/common/middleware/catch_errors.py
@@ -42,7 +42,7 @@ class CatchErrorsContext(WSGIContext):
except: # noqa
self.logger.exception(_('Error: An error occurred'))
resp = HTTPServerError(request=Request(env),
- body='An error occurred',
+ body=b'An error occurred',
content_type='text/plain')
resp.headers['X-Trans-Id'] = trans_id
resp.headers['X-Openstack-Request-Id'] = trans_id