← Back to branch summary

~clint-fewbar/txaws/drop-epsilon

« back to all changes in this revision

Viewing changes to txaws/server/resource.py

  • Committer: Thomas Hervé
  • Date: 2011-11-10 11:14:15 UTC
  • mfrom: (101.1.2 safe-unicode-errors)
  • Revision ID: thomas@canonical.com-20111110111415-9ng2rjs6ud5j0dmh
Merge safe-unicode-errors [r=free.ekanayaka] [f=888445]

Handle unicode messages in API method exceptions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
txaws/server/resource.py
3
3
from pytz import UTC
4
4
 
5
5
from twisted.python import log
 
6
from twisted.python.reflect import safe_str
6
7
from twisted.internet.defer import maybeDeferred
7
8
from twisted.web.resource import Resource
8
9
from twisted.web.server import NOT_DONE_YET
105
106
                if status < 400 or status >= 500:
106
107
                    log.err(failure)
107
108
                else:
108
 
                    log.msg("status: %s message: %s" % (status, failure.value))
 
109
                    log.msg("status: %s message: %s" % (
 
110
                        status, safe_str(failure.value)))
109
111
 
110
112
                bytes = failure.value.response
111
113
                if bytes is None:
112
114
                    bytes = self.dump_error(failure.value, request)
113
115
            else:
114
116
                log.err(failure)
115
 
                bytes = str(failure.value)
 
117
                bytes = safe_str(failure.value)
116
118
                status = 500
117
119
            request.setResponseCode(status)
118
120
            request.write(bytes)