Fixes

diff --git a/src/catalogue/ebook_utils.py b/src/catalogue/ebook_utils.py
index a61d18f..c3e8b68 100644 (file)
--- a/src/catalogue/ebook_utils.py
+++ b/src/catalogue/ebook_utils.py
@@ -26,7 +26,7 @@ def serve_file(file_path, name, mime_type):
 
     response = HttpResponse(content_type=mime_type)
     response['Content-Disposition'] = 'attachment; filename=%s' % name
 
     response = HttpResponse(content_type=mime_type)
     response['Content-Disposition'] = 'attachment; filename=%s' % name

-    with open(file_path) as f:
+    with open(file_path, 'rb') as f:

         for chunk in read_chunks(f):
             response.write(chunk)
     return response
         for chunk in read_chunks(f):
             response.write(chunk)
     return response

diff --git a/src/fileupload/views.py b/src/fileupload/views.py
index 9993ddb..3e6b999 100644 (file)
--- a/src/fileupload/views.py
+++ b/src/fileupload/views.py
@@ -4,7 +4,6 @@ from urllib.parse import quote
 from django.conf import settings
 from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden, Http404
 from django.utils.decorators import method_decorator
 from django.conf import settings
 from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden, Http404
 from django.utils.decorators import method_decorator

-from django.utils.encoding import smart_bytes

 from django.views.decorators.vary import vary_on_headers
 from django.views.generic import FormView, View
 from .forms import UploadForm
 from django.views.decorators.vary import vary_on_headers
 from django.views.generic import FormView, View
 from .forms import UploadForm


@@ -75,10 +74,9 @@ class UploadView(FormView):
         Makes sure it's inside MEDIA_ROOT.
         
         """
         Makes sure it's inside MEDIA_ROOT.
         
         """

-        filename = smart_bytes(filename)

         path = os.path.abspath(os.path.join(
                 settings.MEDIA_ROOT,
         path = os.path.abspath(os.path.join(
                 settings.MEDIA_ROOT,

-                smart_bytes(self.get_directory()),
+                self.get_directory(),

                 filename))
         if not path.startswith(settings.MEDIA_ROOT):
             raise Http404
                 filename))
         if not path.startswith(settings.MEDIA_ROOT):
             raise Http404

diff --git a/src/wiki/views.py b/src/wiki/views.py
index 5dc770f..332f28f 100644 (file)
--- a/src/wiki/views.py
+++ b/src/wiki/views.py
@@ -206,10 +206,10 @@ def gallery(request, directory):
                         settings.IMAGE_DIR,
                         directory))
 
                         settings.IMAGE_DIR,
                         directory))
 

-        base_dir = os.path.join((
+        base_dir = os.path.join(

                     settings.MEDIA_ROOT,
                     settings.IMAGE_DIR,
                     settings.MEDIA_ROOT,
                     settings.IMAGE_DIR,

-                    directory))
+                    directory)

 
         def map_to_url(filename):
             return quote(("%s/%s" % (base_url, filename)))
 
         def map_to_url(filename):
             return quote(("%s/%s" % (base_url, filename)))