From 72ffe53efc9372dc029d89cf72f8cade4ffd9382 Mon Sep 17 00:00:00 2001 From: Pawel Solyga Date: Fri, 3 Apr 2009 17:23:53 +0000 Subject: [PATCH] Remove unused imports soc.cache.base module and rename key variable to filter_key in soc.views.sitemap modules (access to outer scope names). Patch by: Pawel Solyga Reviewed by: to-be-reviewed --- app/soc/cache/base.py | 2 ++ app/soc/cache/logic.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/soc/cache/base.py b/app/soc/cache/base.py index 843fef65..03c88e9f 100644 --- a/app/soc/cache/base.py +++ b/app/soc/cache/base.py @@ -38,6 +38,8 @@ def getCacher(get, put): @wraps(func) def wrapper(*args, **kwargs): + """Decorator wrapper method. + """ result, key = get(*args, **kwargs) if result: return result diff --git a/app/soc/cache/logic.py b/app/soc/cache/logic.py index b467b26e..41df15ec 100644 --- a/app/soc/cache/logic.py +++ b/app/soc/cache/logic.py @@ -34,9 +34,9 @@ def key(model, filter, order): new_filter = {} - for key, value in filter.iteritems(): + for filter_key, value in filter.iteritems(): new_value = value.key().name() if isinstance(value, db.Model) else value - new_filter[key] = new_value + new_filter[filter_key] = new_value return 'query_for_%(kind)s_%(filter)s_%(order)s' % { 'kind': repr(model.kind()), -- 2.11.4.GIT