Index: trunk/packages/sipb-xen-base/files/usr/share/python-support/sipb-xen-base/invirt/config.py
===================================================================
--- trunk/packages/sipb-xen-base/files/usr/share/python-support/sipb-xen-base/invirt/config.py	(revision 795)
+++ trunk/packages/sipb-xen-base/files/usr/share/python-support/sipb-xen-base/invirt/config.py	(revision 796)
@@ -35,5 +35,6 @@
         @with_lock_file(lock_file, False)
         def read_cache():
-            try: ns.cfg = with_closing(file(cache_path))(lambda f: json.read(f.read()))
+            try: ns.cfg = with_closing(file(cache_path)) (
+                lambda f: json.read(f.read()))
             except: ns.do_refresh = True
 
@@ -45,8 +46,8 @@
         def refresh_cache():
             import yaml
-            try:    default_loader = yaml.CSafeLoader
-            except: default_loader = yaml.SafeLoader
-            ns.cfg = with_closing(file(src_path))(lambda f: yaml.load(f, default_loader))
-            try: with_closing(file(cache_path, 'w'))(lambda f: f.write(json.write(ns.cfg)))
+            ns.cfg = with_closing(file(src_path)) (
+                lambda f: yaml.load(f, yaml.CSafeLoader))
+            try: with_closing(file(cache_path, 'w')) (
+                lambda f: f.write(json.write(ns.cfg)))
             except: pass # silent failure
     return ns.cfg