Merge remote-tracking branch 'origin/production' into production

[redakcja.git] / apps / fileupload / views.py

diff --git a/apps/fileupload/views.py b/apps/fileupload/views.py
index e4baf02..a2025fe 100644 (file)
--- a/apps/fileupload/views.py
+++ b/apps/fileupload/views.py
@@ -20,7 +20,7 @@ else:
     def thumbnail(relpath):
         try:
             return default.backend.get_thumbnail(relpath, "x50").url
-        except IOError:
+        except (IOError, ValueError):
             # That's not an image. No thumb.
             return None
 
@@ -42,7 +42,7 @@ class UploadView(FormView):
 
     def get_directory(self):
         """Directory relative to MEDIA_ROOT. Must end with a slash."""
-        return self.kwargs['path'].encode('utf-8')
+        return self.kwargs['path']
 
     def breadcrumbs(self):
         """List of tuples (name, url) or just (name,) for breadcrumbs.
@@ -78,7 +78,7 @@ class UploadView(FormView):
         filename = smart_bytes(filename)
         path = os.path.abspath(os.path.join(
                 settings.MEDIA_ROOT,
-                self.get_directory(),
+                smart_bytes(self.get_directory()),
                 filename))
         if not path.startswith(settings.MEDIA_ROOT):
             raise Http404