Update for newer django

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

diff --git a/sommitrealweird/bpcms/context_processors.py b/sommitrealweird/bpcms/context_processors.py
index 2df38ae886c5bea4492c633be356b4c73c004a35..1d254b1b1f063ab4b13f5b29d43361a80ea1abcb 100644 (file)
--- a/sommitrealweird/bpcms/context_processors.py
+++ b/sommitrealweird/bpcms/context_processors.py
@@ -2,20 +2,15 @@ from bpcms.models import Document, Folder
 from django.conf import settings
 from django.core.cache import cache
 import re
 from django.conf import settings
 from django.core.cache import cache
 import re

-import sys

 
 def content_menu(request):
 
 
 def content_menu(request):
 

-    print >>sys.stderr, "Trying to get menu items from cache"
-

     menu_items = cache.get('bpcms_mainmenu')
 
     if not menu_items:
     menu_items = cache.get('bpcms_mainmenu')
 
     if not menu_items:

-        print >>sys.stderr, "Generating menu items"

         items = Document.objects.filter(folder__isnull=True, islive__exact=True)
         menu_items = []
         for item in items:
         items = Document.objects.filter(folder__isnull=True, islive__exact=True)
         menu_items = []
         for item in items:

-            print >>sys.stderr, "Found: %s" %(item.slug)

             if item.slug != 'index':
                 menu_items.append(
                     {
             if item.slug != 'index':
                 menu_items.append(
                     {


@@ -23,11 +18,8 @@ def content_menu(request):
                         'url': item.get_absolute_url(),
                     }
                 )
                         'url': item.get_absolute_url(),
                     }
                 )

-        print >>sys.stderr, "Now looking for folders"

         folders = Folder.objects.filter(parent__isnull=True)
         for folder in folders:
         folders = Folder.objects.filter(parent__isnull=True)
         for folder in folders:

-            print >>sys.stderr, "Found: %s" %(folder)
-            print >>sys.stderr, "folder path: %s" %(folder.get_absolute_url())

             try:
                 items = Document.objects.filter(folder__exact=folder, islive__exact=True, slug__exact='index')
                 item = items[0]
             try:
                 items = Document.objects.filter(folder__exact=folder, islive__exact=True, slug__exact='index')
                 item = items[0]


@@ -38,11 +30,10 @@ def content_menu(request):
                     }
                 )
             except:
                     }
                 )
             except:

-                print >>sys.stderr, "Failed to add: %s" %(folder)

                 pass
 
         menu_items.sort( \
                 pass
 
         menu_items.sort( \

-            cmp=lambda x,y: cmp(x['title'].lower(), y['title'].lower()))
+            key=lambda x: x['title'].lower())

         cache.set('bpcms_mainmenu', menu_items, 3600)
 
     return {
         cache.set('bpcms_mainmenu', menu_items, 3600)
 
     return {


@@ -53,9 +44,16 @@ def content_submenu(request):
     # find where we are in the tree first
     folderpath = request.path
     folderpath = re.sub(u'^%s' %(settings.BPCMS_ROOT), '', folderpath)
     # find where we are in the tree first
     folderpath = request.path
     folderpath = re.sub(u'^%s' %(settings.BPCMS_ROOT), '', folderpath)

+

     # right - that should be any prefix got rid of, now traverse the tree till
     # we've got something
     # right - that should be any prefix got rid of, now traverse the tree till
     # we've got something

-    menu_items = cache.get('bpcms_contentmenu_%s' %(folderpath))
+    try:
+        menu_items = cache.get('bpcms_contentmenu_%s' %(folderpath))
+    except:
+        # fail on cache engine or bad key, ignore
+        return {
+            'content_submenu': {},
+        }

 
     if not menu_items:
         folder = None
 
     if not menu_items:
         folder = None


@@ -96,7 +94,7 @@ def content_submenu(request):
                     )
 
         menu_items.sort( \
                     )
 
         menu_items.sort( \

-            cmp=lambda x,y: cmp(x['title'].lower(), y['title'].lower()))
+            key=lambda x: x['title'].lower())

 
         cache.set('bpcms_contentmenu_%s' %("/".join(folderpath)), menu_items)
 
 
         cache.set('bpcms_contentmenu_%s' %("/".join(folderpath)), menu_items)