Merge lp:~blr/charms/precise/squid-forwardproxy/trunk into lp:~canonical-launchpad-branches/charms/precise/squid-forwardproxy/trunk

[Kit Randel]

Use yaml.safe_load rather than yaml.load.

Use yaml.safe_load rather than yaml.load.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-08-14 00:45:46 +0000
+++ hooks/hooks.py	2015-09-16 02:56:43 +0000
@@ -223,11 +223,11 @@
             refresh_patterns = json.loads(config_data['refresh_patterns'])
         ## else use YAML (current):
         except ValueError:
-            refresh_patterns = yaml.load(config_data['refresh_patterns'])
+            refresh_patterns = yaml.safe_load(config_data['refresh_patterns'])
     else:
         refresh_patterns = {}
     if config_data['auth_list']:
-        auth_list = yaml.load(config_data['auth_list'])
+        auth_list = yaml.safe_load(config_data['auth_list'])
     else:
         auth_list = []
 
@@ -277,7 +277,7 @@
 
     auth_params = []
     if config_data['auth_params']:
-        auth_params_data = yaml.load(config_data['auth_params'])
+        auth_params_data = yaml.safe_load(config_data['auth_params'])
         for scheme in auth_params_data:
             if 'children' in scheme and isinstance(scheme['children'], dict):
                 children = '%d' % scheme['children']['number']