changeset 3932:2bcd23157684

caching: remove page_or_wiki scope
author Johannes Berg <johannes AT sipsolutions DOT net>
date Tue, 05 Aug 2008 17:35:16 +0200
parents 9c2fb9246e66
children b48dbb4a46ff
files MoinMoin/caching.py
diffstat 1 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/caching.py	Sun Aug 03 22:58:40 2008 +0200
+++ b/MoinMoin/caching.py	Tue Aug 05 17:35:16 2008 +0200
@@ -25,12 +25,7 @@
 
 
 def get_arena_dir(request, arena, scope):
-    if scope == 'page_or_wiki': # XXX DEPRECATED, remove later
-        if isinstance(arena, str):
-            return os.path.join(request.cfg.cache_dir, request.cfg.siteid, arena)
-        else: # arena is in fact a page object
-            return arena.getPagePath('cache', check_create=1)
-    elif scope == 'item': # arena is a Page instance
+    if scope == 'item': # arena is a Page instance
         # we could move cache out of the page directory and store it to cache_dir
         return arena.getPagePath('cache', check_create=1)
     elif scope == 'wiki':
@@ -49,7 +44,7 @@
 
 
 class CacheEntry:
-    def __init__(self, request, arena, key, scope='page_or_wiki', do_locking=True,
+    def __init__(self, request, arena, key, scope='wiki', do_locking=True,
                  use_pickle=False, use_encode=False):
         """ init a cache entry
             @param request: the request object