Merge pull request #2162 from charltonaustin/fix_zendesk_ticket_11965

Fixing how we encode some JSON.
This commit is contained in:
Charlton Austin 2016-11-28 16:53:08 -05:00 committed by GitHub
commit a3ab28c0f3

View file

@ -7,6 +7,7 @@ import copy
import hmac
import string
import logging
import json
from _pyio import BufferedReader
from uuid import uuid4
@ -320,11 +321,11 @@ class SwiftStorage(BaseStorage):
continue
# Queue the chunk to be deleted, as it is empty and therefore unused.
self._context.chunk_cleanup_queue.put(['segment/%s/%s' % (self._context.location, uuid)], {
self._context.chunk_cleanup_queue.put(['segment/%s/%s' % (self._context.location, uuid)], json.dumps({
'location': self._context.location,
'uuid': uuid,
'path': segment.path,
}, available_after=_CHUNK_CLEANUP_DELAY)
}), available_after=_CHUNK_CLEANUP_DELAY)
# Finally, we write an empty file at the proper location with a X-Object-Manifest
# header pointing to the prefix for the segments.