Revision 5c2058e7

b/kamaki/clients/pithos/__init__.py
445 445
                try:
446 446
                    details = ['%s' % thread.exception for thread in missing]
447 447
                except Exception:
448
                    details = []
448
                    details = ['Also, failed to read thread exceptions']
449 449
                raise ClientError(
450 450
                    '%s blocks failed to upload' % len(missing),
451 451
                    details=details)
......
596 596
            format='json',
597 597
            hashmap=True,
598 598
            content_type=content_type,
599
            content_encoding=content_encoding,
599 600
            if_etag_match=if_etag_match,
600 601
            if_etag_not_match='*' if if_not_exist else None,
601 602
            etag=etag,
b/kamaki/clients/pithos/test.py
1028 1028
        tmpFile.seek(0)
1029 1029
        ctype = 'video/mpeg'
1030 1030
        sharing = dict(read=['u1', 'g1', 'u2'], write=['u1'])
1031
        r = self.client.upload_object(obj, tmpFile,
1031
        r = self.client.upload_object(
1032
            obj, tmpFile,
1032 1033
            content_type=ctype, sharing=sharing)
1033 1034
        self.assert_dicts_are_equal(r, exp_headers)
1034 1035
        self.assertEqual(OP.mock_calls[-1][2]['content_type'], ctype)

Also available in: Unified diff