From cac46106b43ea8c757c6f860fed17e403ac7f893 Mon Sep 17 00:00:00 2001 From: Armin Ronacher Date: Mon, 22 Oct 2007 23:27:36 +0200 Subject: [PATCH] experimental alternative client creation for the memcached loader --HG-- branch : trunk --- jinja/loaders.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/jinja/loaders.py b/jinja/loaders.py index 35859a6f..6fc4ac73 100644 --- a/jinja/loaders.py +++ b/jinja/loaders.py @@ -272,19 +272,22 @@ class MemcachedLoaderMixin(object): """ def __init__(self, use_memcache, memcache_time=60 * 60 * 24 * 7, - memcache_host=None, item_prefix='template/'): - try: - try: - from cmemcache import Client - except ImportError: - from memcache import Client - except ImportError: - raise RuntimeError('the %r loader requires an installed ' - 'memcache module' % self.__class__.__name__) + memcache_host=None, item_prefix='template/', client=None): if memcache_host is None: memcache_host = ['127.0.0.1:11211'] if use_memcache: - self.__memcache = Client(list(memcache_host)) + if client is None: + try: + try: + from cmemcache import Client + except ImportError: + from memcache import Client + except ImportError: + raise RuntimeError('the %r loader requires an installed ' + 'memcache module' % + self.__class__.__name__) + client = Client(list(memcache_host)) + self.__memcache = client self.__memcache_time = memcache_time else: self.__memcache = None -- 2.47.3