diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2015-03-05 17:45:54 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2015-03-05 17:45:54 -0600 |
| commit | fc3c8f21a08a97051a709cb1a41b4339c3748ab5 (patch) | |
| tree | 91b318e381c2e3d073b58e3ac7aa30ef5edfb300 | |
| parent | 50f12414df260de9605489ec0ca5427cff0813bf (diff) | |
| download | mediagoblin-fc3c8f21a08a97051a709cb1a41b4339c3748ab5.tar.lz mediagoblin-fc3c8f21a08a97051a709cb1a41b4339c3748ab5.tar.xz mediagoblin-fc3c8f21a08a97051a709cb1a41b4339c3748ab5.zip | |
Patch from breton: fix #5053 (gmg addmedia broken in 0.8.0)
| -rw-r--r-- | mediagoblin/media_types/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mediagoblin/media_types/__init__.py b/mediagoblin/media_types/__init__.py index ab39fa36..3eeead86 100644 --- a/mediagoblin/media_types/__init__.py +++ b/mediagoblin/media_types/__init__.py @@ -16,6 +16,7 @@ import os import logging +import shutil import tempfile from mediagoblin.tools.pluginapi import hook_handle @@ -143,7 +144,7 @@ def sniff_media(media_file, filename): # copy the contents to a .name-enabled temporary file for further checks # TODO: there are cases when copying is not required tmp_media_file = tempfile.NamedTemporaryFile() - media_file.save(tmp_media_file.name) + shutil.copyfileobj(media_file, tmp_media_file) media_file.seek(0) try: return type_match_handler(tmp_media_file, filename) |