From 80e36aec6a00a9ded4741e1ecff8c3c50774fa53 Mon Sep 17 00:00:00 2001 From: Massimo DiPierro Date: Tue, 13 Mar 2012 13:59:15 -0500 Subject: [PATCH] cache is now gluino friendly --- VERSION | 2 +- gluon/cache.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 80eb1a64..4a308656 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.7 (2012-03-13 13:54:42) dev +Version 1.99.7 (2012-03-13 13:59:13) dev diff --git a/gluon/cache.py b/gluon/cache.py index 06d7b506..b280346c 100644 --- a/gluon/cache.py +++ b/gluon/cache.py @@ -27,6 +27,11 @@ import thread import os import logging import re +try: + import settings + have_settings = True +except ImportError: + have_settings = False logger = logging.getLogger("web2py.cache") @@ -367,8 +372,8 @@ class Cache(object): the global request object """ # GAE will have a special caching - import settings - if settings.global_settings.web2py_runtime_gae: + + if have_settings and settings.global_settings.web2py_runtime_gae: from contrib.gae_memcache import MemcacheClient self.ram=self.disk=MemcacheClient(request) else: