aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOdin Hørthe Omdal <odinho@opera.com>2014-08-03 18:07:28 +0200
committerChristopher Allan Webber <cwebber@dustycloud.org>2014-09-07 09:43:49 -0500
commit1b4e199668ada5c2ec47df7432ab69e315dc0601 (patch)
tree666b47da71f50cc05e9f885bd339e45d5e47e938
parent4f1a5148cb9b64f7086d047359f612a84f3d4c9c (diff)
downloadmediagoblin-1b4e199668ada5c2ec47df7432ab69e315dc0601.tar.lz
mediagoblin-1b4e199668ada5c2ec47df7432ab69e315dc0601.tar.xz
mediagoblin-1b4e199668ada5c2ec47df7432ab69e315dc0601.zip
Raw image mediatype had a non-unicode logging call
Was causing UnicodeDecodeError when file/folder was not ascii. Fixes bug #935.
-rw-r--r--mediagoblin/media_types/raw_image/processing.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/media_types/raw_image/processing.py b/mediagoblin/media_types/raw_image/processing.py
index 55a48b50..5ff54cf3 100644
--- a/mediagoblin/media_types/raw_image/processing.py
+++ b/mediagoblin/media_types/raw_image/processing.py
@@ -67,8 +67,8 @@ class InitialRawProcessor(InitialProcessor):
# Extract the biggest preview and write it as our working image
md.previews[-1].write_to_file(
self.process_filename.encode('utf-8'))
- self.process_filename += ".jpg"
- _log.debug('Wrote new file from {0} to preview (jpg) {1}'.format(
+ self.process_filename += '.jpg'
+ _log.debug(u'Wrote new file from {0} to preview (jpg) {1}'.format(
self._original_raw, self.process_filename))
# Override the namebuilder with our new jpg-based name