untracked file from server

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

diff --git a/apps/wiki_img/views.py b/apps/wiki_img/views.py
index 08a0a03..2b8dd67 100644 (file)
--- a/apps/wiki_img/views.py
+++ b/apps/wiki_img/views.py
@@ -7,7 +7,7 @@ from django.core.urlresolvers import reverse
 from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError,
                 ajax_require_permission)
 
 from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError,
                 ajax_require_permission)
 

-from django import http
+from django.http import Http404, HttpResponse, HttpResponseForbidden

 from django.shortcuts import get_object_or_404, render
 from django.views.decorators.http import require_GET, require_POST
 from django.conf import settings
 from django.shortcuts import get_object_or_404, render
 from django.views.decorators.http import require_GET, require_POST
 from django.conf import settings


@@ -188,7 +188,7 @@ def diff(request, object_id):
         docA = ""
     docB = doc.at_revision(revB).materialize()
 
         docA = ""
     docB = doc.at_revision(revB).materialize()
 

-    return http.HttpResponse(nice_diff.html_diff_table(docA.splitlines(),
+    return HttpResponse(nice_diff.html_diff_table(docA.splitlines(),

                                          docB.splitlines(), context=3))
 
 
                                          docB.splitlines(), context=3))