X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/b0773e2054ab6bc6305142fdd28799e0f41616c9..888f954ea4d9b923e963525dbdf83d9ad1f9b443:/apps/api/handlers/library_handlers.py diff --git a/apps/api/handlers/library_handlers.py b/apps/api/handlers/library_handlers.py index 9d50d023..0f5b6d64 100644 --- a/apps/api/handlers/library_handlers.py +++ b/apps/api/handlers/library_handlers.py @@ -60,8 +60,7 @@ class LibraryHandler(BaseHandler): documents = {} - for docid in lib.documents(): - docid = docid.decode('utf-8') + for docid in lib.documents(): documents[docid] = { 'url': reverse('document_view', args=[docid]), 'name': docid, @@ -238,7 +237,6 @@ class DocumentHTMLHandler(BaseHandler): # # Image Gallery # -from django.core.files.storage import FileSystemStorage class DocumentGalleryHandler(BaseHandler): allowed_methods = ('GET') @@ -256,7 +254,9 @@ class DocumentGalleryHandler(BaseHandler): gallery = {'name': assoc.name, 'pages': []} - for file in sorted(os.listdir(dirpath), key=natural_order()): + for file in sorted( os.listdir(dirpath) ): + file = file.encode('utf-8') + log.info(file) name, ext = os.path.splitext(os.path.basename(file))