# HG changeset patch
# User Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
# Date 1471462838 -7200
# Node ID 0afdd2802a0a36d90c47e1405e757d18c35d75de
# Parent  3521120e72bc726cad27fa41a307b52f1d831332
utils: group cache-related methods

Note: method itself is unchanged

diff -r 3521120e72bc -r 0afdd2802a0a kallithea/lib/utils.py
--- a/kallithea/lib/utils.py	Wed Aug 03 18:26:33 2016 +0200
+++ b/kallithea/lib/utils.py	Wed Aug 17 21:40:38 2016 +0200
@@ -551,34 +551,6 @@
     return added, removed
 
 
-# set cache regions for beaker so celery can utilise it
-def add_cache(settings):
-    cache_settings = {'regions': None}
-    for key in settings.keys():
-        for prefix in ['beaker.cache.', 'cache.']:
-            if key.startswith(prefix):
-                name = key.split(prefix)[1].strip()
-                cache_settings[name] = settings[key].strip()
-    if cache_settings['regions']:
-        for region in cache_settings['regions'].split(','):
-            region = region.strip()
-            region_settings = {}
-            for key, value in cache_settings.items():
-                if key.startswith(region):
-                    region_settings[key.split('.')[1]] = value
-            region_settings['expire'] = int(region_settings.get('expire',
-                                                                60))
-            region_settings.setdefault('lock_dir',
-                                       cache_settings.get('lock_dir'))
-            region_settings.setdefault('data_dir',
-                                       cache_settings.get('data_dir'))
-
-            if 'type' not in region_settings:
-                region_settings['type'] = cache_settings.get('type',
-                                                             'memory')
-            beaker.cache.cache_regions[region] = region_settings
-
-
 def load_rcextensions(root_path):
     import kallithea
     from kallithea.config import conf
@@ -770,6 +742,38 @@
     return json.dumps(data, encoding='utf-8')
 
 
+#===============================================================================
+# CACHE RELATED METHODS
+#===============================================================================
+
+# set cache regions for beaker so celery can utilise it
+def add_cache(settings):
+    cache_settings = {'regions': None}
+    for key in settings.keys():
+        for prefix in ['beaker.cache.', 'cache.']:
+            if key.startswith(prefix):
+                name = key.split(prefix)[1].strip()
+                cache_settings[name] = settings[key].strip()
+    if cache_settings['regions']:
+        for region in cache_settings['regions'].split(','):
+            region = region.strip()
+            region_settings = {}
+            for key, value in cache_settings.items():
+                if key.startswith(region):
+                    region_settings[key.split('.')[1]] = value
+            region_settings['expire'] = int(region_settings.get('expire',
+                                                                60))
+            region_settings.setdefault('lock_dir',
+                                       cache_settings.get('lock_dir'))
+            region_settings.setdefault('data_dir',
+                                       cache_settings.get('data_dir'))
+
+            if 'type' not in region_settings:
+                region_settings['type'] = cache_settings.get('type',
+                                                             'memory')
+            beaker.cache.cache_regions[region] = region_settings
+
+
 def conditional_cache(region, prefix, condition, func):
     """