Remove some stale scripts.

[redakcja.git] / src / wiki / views.py

diff --git a/src/wiki/views.py b/src/wiki/views.py
index e1ef6ae..17f7b73 100644 (file)
--- a/src/wiki/views.py
+++ b/src/wiki/views.py
@@ -1,24 +1,25 @@
-# -*- coding: utf-8 -*-
+# This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from datetime import datetime
 import os
 import logging
 from time import mktime
 from datetime import datetime
 import os
 import logging
 from time import mktime

-import urllib
+from urllib.parse import quote

 
 from django.conf import settings
 
 from django.conf import settings

-from django.core.urlresolvers import reverse
+from django.urls import reverse

 from django import http
 from django.http import Http404, HttpResponseForbidden
 from django.middleware.gzip import GZipMiddleware
 from django.utils.decorators import decorator_from_middleware
 from django import http
 from django.http import Http404, HttpResponseForbidden
 from django.middleware.gzip import GZipMiddleware
 from django.utils.decorators import decorator_from_middleware

-from django.utils.encoding import smart_unicode

 from django.utils.formats import localize
 from django.utils.translation import ugettext as _
 from django.views.decorators.http import require_POST, require_GET
 from django.shortcuts import get_object_or_404, render
 
 from catalogue.models import Book, Chunk
 from django.utils.formats import localize
 from django.utils.translation import ugettext as _
 from django.views.decorators.http import require_POST, require_GET
 from django.shortcuts import get_object_or_404, render
 
 from catalogue.models import Book, Chunk

-import nice_diff
+from . import nice_diff

 from wiki import forms
 from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError,
                 ajax_require_permission)
 from wiki import forms
 from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError,
                 ajax_require_permission)


@@ -116,7 +117,7 @@ def text(request, chunk_id):
     if request.method == 'POST':
         form = forms.DocumentTextSaveForm(request.POST, user=request.user, prefix="textsave")
         if form.is_valid():
     if request.method == 'POST':
         form = forms.DocumentTextSaveForm(request.POST, user=request.user, prefix="textsave")
         if form.is_valid():

-            if request.user.is_authenticated():
+            if request.user.is_authenticated:

                 author = request.user
             else:
                 author = None
                 author = request.user
             else:
                 author = None


@@ -181,7 +182,7 @@ def revert(request, chunk_id):
         comment = form.cleaned_data['comment']
         comment += "\n#revert to %s" % revision
 
         comment = form.cleaned_data['comment']
         comment += "\n#revert to %s" % revision
 

-        if request.user.is_authenticated():
+        if request.user.is_authenticated:

             author = request.user
         else:
             author = None
             author = request.user
         else:
             author = None


@@ -203,27 +204,27 @@ def revert(request, chunk_id):
 def gallery(request, directory):
     try:
         base_url = ''.join((
 def gallery(request, directory):
     try:
         base_url = ''.join((

-                        smart_unicode(settings.MEDIA_URL),
-                        smart_unicode(settings.IMAGE_DIR),
-                        smart_unicode(directory)))
+                        settings.MEDIA_URL,
+                        settings.IMAGE_DIR,
+                        directory))

 
         base_dir = os.path.join(
 
         base_dir = os.path.join(

-                    smart_unicode(settings.MEDIA_ROOT),
-                    smart_unicode(settings.IMAGE_DIR),
-                    smart_unicode(directory))
+                    settings.MEDIA_ROOT,
+                    settings.IMAGE_DIR,
+                    directory)

 
         def map_to_url(filename):
 
         def map_to_url(filename):

-            return urllib.quote(("%s/%s" % (base_url, smart_unicode(filename))).encode('utf-8'))
+            return quote(("%s/%s" % (base_url, filename)))

 
         def is_image(filename):
             return os.path.splitext(filename)[1].lower() in (u'.jpg', u'.jpeg', u'.png')
 
 
         def is_image(filename):
             return os.path.splitext(filename)[1].lower() in (u'.jpg', u'.jpeg', u'.png')
 

-        images = [map_to_url(f) for f in map(smart_unicode, os.listdir(base_dir)) if is_image(f)]
+        images = [map_to_url(f) for f in os.listdir(base_dir) if is_image(f)]

         images.sort()
 
         books = Book.objects.filter(gallery=directory)
 
         images.sort()
 
         books = Book.objects.filter(gallery=directory)
 

-        if not all(book.public for book in books) and not request.user.is_authenticated():
+        if not all(book.public for book in books) and not request.user.is_authenticated:

             return HttpResponseForbidden("Not authorized.")
 
         return JSONResponse(images)
             return HttpResponseForbidden("Not authorized.")
 
         return JSONResponse(images)


@@ -281,7 +282,7 @@ def history(request, chunk_id):
                 "author": change.author_str(),
                 "date": localize(change.created_at),
                 "publishable": _("Publishable") + "\n" if change.publishable else "",
                 "author": change.author_str(),
                 "date": localize(change.created_at),
                 "publishable": _("Publishable") + "\n" if change.publishable else "",

-                "tag": ',\n'.join(unicode(tag) for tag in change.tags.all()),
+                "tag": ',\n'.join(str(tag) for tag in change.tags.all()),

                 "published": _("Published") + ": " + \
                     localize(change.publish_log.order_by('-book_record__timestamp')[0].book_record.timestamp) \
                     if change.publish_log.exists() else "",
                 "published": _("Published") + ": " + \
                     localize(change.publish_log.order_by('-book_record__timestamp')[0].book_record.timestamp) \
                     if change.publish_log.exists() else "",