diff options
| author | Mike Linksvayer <ml@gondwanaland.com> | 2012-12-20 12:50:43 -0800 |
|---|---|---|
| committer | Mike Linksvayer <ml@gondwanaland.com> | 2012-12-20 12:50:43 -0800 |
| commit | 1d0148aef1493467dacb6c39c4e080ee4a5246d2 (patch) | |
| tree | 5213418660d4e079eb8dac6bc8ea2e4fdc140088 /mediagoblin/storage/cloudfiles.py | |
| parent | 200433dc38a2139462e0331be36ee49a80a81a12 (diff) | |
| parent | 5c99cd01a70f2d597ac7669e8d944ddf79b05281 (diff) | |
| download | mediagoblin-1d0148aef1493467dacb6c39c4e080ee4a5246d2.tar.lz mediagoblin-1d0148aef1493467dacb6c39c4e080ee4a5246d2.tar.xz mediagoblin-1d0148aef1493467dacb6c39c4e080ee4a5246d2.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Conflicts:
docs/source/siteadmin/media-types.rst
Diffstat (limited to 'mediagoblin/storage/cloudfiles.py')
| -rw-r--r-- | mediagoblin/storage/cloudfiles.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mediagoblin/storage/cloudfiles.py b/mediagoblin/storage/cloudfiles.py index ced3beb3..1b5a6363 100644 --- a/mediagoblin/storage/cloudfiles.py +++ b/mediagoblin/storage/cloudfiles.py @@ -104,10 +104,13 @@ class CloudFilesStorage(StorageInterface): mimetype = mimetypes.guess_type( filepath[-1]) - if mimetype: + if mimetype[0]: # Set the mimetype on the CloudFiles object obj.content_type = mimetype[0] obj.metadata = {'mime-type': mimetype[0]} + else: + obj.content_type = 'application/octet-stream' + obj.metadata = {'mime-type': 'application/octet-stream'} return CloudFilesStorageObjectWrapper(obj, *args, **kwargs) |