Merge lp:~tvansteenburgh/juju-deployer/1463700 into lp:juju-deployer

[Tim Van Steenburgh]

Make Charm.config return empty dict instead of None

Make Charm.config return {} instead of None

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Tom Haddon (mthaddon)]

Abstaining since this is so old, and the bug has been marked fix released.

review: Abstain

Unmerged revisions

153. By Tim Van Steenburgh on 2015-08-06

Make Charm.config return empty dict instead of None

=== modified file 'deployer/charm.py'
--- deployer/charm.py	2015-08-04 12:50:12 +0000
+++ deployer/charm.py	2015-08-06 16:44:32 +0000
@@ -229,7 +229,7 @@
             return {}
 
         with open(config_path) as fh:
-            return yaml_load(fh.read()).get('options', {})
+            return yaml_load(fh.read()).get('options') or {}
 
     @property
     def metadata(self):