From b1fffc3a1b2dbbb807213b85f538e59251b9bf35 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 28 Mar 2014 22:32:14 +0100
Subject: Remove bad whitespaces Merged vuolter/pyload@00288e6
---
module/lib/beaker/ext/database.py | 20 ++++++++++----------
module/lib/beaker/ext/google.py | 22 +++++++++++-----------
module/lib/beaker/ext/memcached.py | 14 +++++++-------
3 files changed, 28 insertions(+), 28 deletions(-)
(limited to 'module/lib/beaker/ext')
diff --git a/module/lib/beaker/ext/database.py b/module/lib/beaker/ext/database.py
index 701e6f7d2..7e3db6899 100644
--- a/module/lib/beaker/ext/database.py
+++ b/module/lib/beaker/ext/database.py
@@ -30,12 +30,12 @@ class DatabaseNamespaceManager(OpenResourceNamespaceManager):
except ImportError:
raise InvalidCacheBackendError("Database cache backend requires "
"the 'sqlalchemy' library")
-
+
def __init__(self, namespace, url=None, sa_opts=None, optimistic=False,
table_name='beaker_cache', data_dir=None, lock_dir=None,
**params):
"""Creates a database namespace manager
-
+
``url``
SQLAlchemy compliant db url
``sa_opts``
@@ -49,7 +49,7 @@ class DatabaseNamespaceManager(OpenResourceNamespaceManager):
The table name to use in the database for the cache.
"""
OpenResourceNamespaceManager.__init__(self, namespace)
-
+
if sa_opts is None:
sa_opts = params
@@ -59,7 +59,7 @@ class DatabaseNamespaceManager(OpenResourceNamespaceManager):
self.lock_dir = data_dir + "/container_db_lock"
if self.lock_dir:
verify_directory(self.lock_dir)
-
+
# Check to see if the table's been created before
url = url or sa_opts['sa.url']
table_key = url + table_name
@@ -90,7 +90,7 @@ class DatabaseNamespaceManager(OpenResourceNamespaceManager):
self._is_new = False
self.loaded = False
self.cache = DatabaseNamespaceManager.tables.get(table_key, make_cache)
-
+
def get_access_lock(self):
return null_synchronizer()
@@ -104,7 +104,7 @@ class DatabaseNamespaceManager(OpenResourceNamespaceManager):
if self.loaded:
self.flags = flags
return
-
+
cache = self.cache
result = sa.select([cache.c.data],
cache.c.namespace==self.namespace
@@ -123,7 +123,7 @@ class DatabaseNamespaceManager(OpenResourceNamespaceManager):
self._is_new = True
self.flags = flags
self.loaded = True
-
+
def do_close(self):
if self.flags is not None and (self.flags == 'c' or self.flags == 'w'):
cache = self.cache
@@ -136,12 +136,12 @@ class DatabaseNamespaceManager(OpenResourceNamespaceManager):
cache.update(cache.c.namespace==self.namespace).execute(
data=self.hash, accessed=datetime.now())
self.flags = None
-
+
def do_remove(self):
cache = self.cache
cache.delete(cache.c.namespace==self.namespace).execute()
self.hash = {}
-
+
# We can retain the fact that we did a load attempt, but since the
# file is gone this will be a new namespace should it be saved.
self._is_new = True
@@ -151,7 +151,7 @@ class DatabaseNamespaceManager(OpenResourceNamespaceManager):
def __contains__(self, key):
return self.hash.has_key(key)
-
+
def __setitem__(self, key, value):
self.hash[key] = value
diff --git a/module/lib/beaker/ext/google.py b/module/lib/beaker/ext/google.py
index dd8380d7f..b6d617d6b 100644
--- a/module/lib/beaker/ext/google.py
+++ b/module/lib/beaker/ext/google.py
@@ -23,11 +23,11 @@ class GoogleNamespaceManager(OpenResourceNamespaceManager):
except ImportError:
raise InvalidCacheBackendError("Datastore cache backend requires the "
"'google.appengine.ext' library")
-
+
def __init__(self, namespace, table_name='beaker_cache', **params):
"""Creates a datastore namespace manager"""
OpenResourceNamespaceManager.__init__(self, namespace)
-
+
def make_cache():
table_dict = dict(created=db.DateTimeProperty(),
accessed=db.DateTimeProperty(),
@@ -40,11 +40,11 @@ class GoogleNamespaceManager(OpenResourceNamespaceManager):
self._is_new = False
self.loaded = False
self.log_debug = logging.DEBUG >= log.getEffectiveLevel()
-
+
# Google wants namespaces to start with letters, change the namespace
# to start with a letter
self.namespace = 'p%s' % self.namespace
-
+
def get_access_lock(self):
return null_synchronizer()
@@ -57,9 +57,9 @@ class GoogleNamespaceManager(OpenResourceNamespaceManager):
if self.loaded:
self.flags = flags
return
-
+
item = self.cache.get_by_key_name(self.namespace)
-
+
if not item:
self._is_new = True
self.hash = {}
@@ -74,7 +74,7 @@ class GoogleNamespaceManager(OpenResourceNamespaceManager):
self._is_new = True
self.flags = flags
self.loaded = True
-
+
def do_close(self):
if self.flags is not None and (self.flags == 'c' or self.flags == 'w'):
if self._is_new:
@@ -90,12 +90,12 @@ class GoogleNamespaceManager(OpenResourceNamespaceManager):
item.accessed = datetime.now()
item.put()
self.flags = None
-
+
def do_remove(self):
item = self.cache.get_by_key_name(self.namespace)
item.delete()
self.hash = {}
-
+
# We can retain the fact that we did a load attempt, but since the
# file is gone this will be a new namespace should it be saved.
self._is_new = True
@@ -105,7 +105,7 @@ class GoogleNamespaceManager(OpenResourceNamespaceManager):
def __contains__(self, key):
return self.hash.has_key(key)
-
+
def __setitem__(self, key, value):
self.hash[key] = value
@@ -114,7 +114,7 @@ class GoogleNamespaceManager(OpenResourceNamespaceManager):
def keys(self):
return self.hash.keys()
-
+
class GoogleContainer(Container):
namespace_class = GoogleNamespaceManager
diff --git a/module/lib/beaker/ext/memcached.py b/module/lib/beaker/ext/memcached.py
index 96516953f..2f367c36d 100644
--- a/module/lib/beaker/ext/memcached.py
+++ b/module/lib/beaker/ext/memcached.py
@@ -8,7 +8,7 @@ memcache = None
class MemcachedNamespaceManager(NamespaceManager):
clients = SyncDict()
-
+
@classmethod
def _init_dependencies(cls):
global memcache
@@ -27,20 +27,20 @@ class MemcachedNamespaceManager(NamespaceManager):
except ImportError:
raise InvalidCacheBackendError("Memcached cache backend requires either "
"the 'memcache' or 'cmemcache' library")
-
+
def __init__(self, namespace, url=None, data_dir=None, lock_dir=None, **params):
NamespaceManager.__init__(self, namespace)
-
+
if not url:
raise MissingCacheParameter("url is required")
-
+
if lock_dir:
self.lock_dir = lock_dir
elif data_dir:
self.lock_dir = data_dir + "/container_mcd_lock"
if self.lock_dir:
verify_directory(self.lock_dir)
-
+
self.mc = MemcachedNamespaceManager.clients.get(url, memcache.Client, url.split(';'))
def get_creation_lock(self, key):
@@ -68,13 +68,13 @@ class MemcachedNamespaceManager(NamespaceManager):
def __setitem__(self, key, value):
self.set_value(key, value)
-
+
def __delitem__(self, key):
self.mc.delete(self._format_key(key))
def do_remove(self):
self.mc.flush_all()
-
+
def keys(self):
raise NotImplementedError("Memcache caching does not support iteration of all cache keys")
--
cgit v1.2.3