Changes for django 2.2

[sommitrealweird.git] / sommitrealweird / bpcms / views.py

diff --git a/sommitrealweird/bpcms/views.py b/sommitrealweird/bpcms/views.py
index 601fb15b51d563467a00b708ad4dd780bae96bc7..e0087c86ad5aa26a4eb14f4a959bb0428aaaab63 100644 (file)
--- a/sommitrealweird/bpcms/views.py
+++ b/sommitrealweird/bpcms/views.py
@@ -1,7 +1,8 @@
 from bpcms.models import CSSDocument, Document, Folder
 from bpcms.models import CSSDocument, Document, Folder

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

 from django.shortcuts import render
 from django.template import RequestContext, loader
 from django.shortcuts import render
 from django.template import RequestContext, loader

+import sys

 
 def document_view(request, slug=None, folders=None):
     if folders == None and slug == None:
 
 def document_view(request, slug=None, folders=None):
     if folders == None and slug == None:


@@ -28,7 +29,7 @@ def document_view(request, slug=None, folders=None):
 
     if folder != None:
         try:
 
     if folder != None:
         try:

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

                 doc = Document.objects.get(slug__exact=slug, islive__exact=True, folder__exact=folder)
             else:
 
                 doc = Document.objects.get(slug__exact=slug, islive__exact=True, folder__exact=folder)
             else:
 


@@ -44,11 +45,12 @@ def document_view(request, slug=None, folders=None):
                 raise Http404
     else:
         try:
                 raise Http404
     else:
         try:

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

                 doc = Document.objects.get(slug__exact=slug, islive__exact=True, folder__isnull=True)
             else:
                 doc = Document.objects.get(slug__exact=slug, folder__isnull=True)
         except:
                 doc = Document.objects.get(slug__exact=slug, islive__exact=True, folder__isnull=True)
             else:
                 doc = Document.objects.get(slug__exact=slug, folder__isnull=True)
         except:

+            sys.stderr.write("Unexpected error:", sys.exc_info()[0])

             try:
                 folder = Folder.objects.get(slug__exact=slug, parent__isnull=True)
                 if not request.user.is_authenticated():
             try:
                 folder = Folder.objects.get(slug__exact=slug, parent__isnull=True)
                 if not request.user.is_authenticated():