diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-10 18:53:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-10 18:53:15 +0000 |
| commit | a6f3be34bcf610e4a591c80c12424638fa2cb6e0 (patch) | |
| tree | 118002acac737b531847e36b8d419309721b6034 | |
| parent | 9dea28874702d3b35c5e18d2a1db9bf4eefba613 (diff) | |
| parent | 435ee13dd3e74590d58f4376788ba5a0875e0049 (diff) | |
| download | heat-a6f3be34bcf610e4a591c80c12424638fa2cb6e0.tar.gz | |
Merge "Add explicit return to _get_property_value()"
| -rw-r--r-- | heat/engine/properties.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/heat/engine/properties.py b/heat/engine/properties.py index 6b676c31a..8c759083f 100644 --- a/heat/engine/properties.py +++ b/heat/engine/properties.py @@ -451,6 +451,8 @@ class Properties(collections.Mapping): return prop.get_value(None, validate) elif prop.required(): raise ValueError(_('Property %s not assigned') % key) + else: + return None def __getitem__(self, key): return self._get_property_value(key) |