diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-23 18:59:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-23 18:59:17 +0000 |
| commit | 4eb63b8ef278de2e82e3b4957b95ba6fd9032e4f (patch) | |
| tree | 5e9bc420343439d293627608562e3e331681be29 | |
| parent | ef950289d8195de479d51e687cb40ec992dbfaa7 (diff) | |
| parent | 5d692deb7f188735ceadee1e5b8fb8360c621901 (diff) | |
| download | python-cinderclient-1.10.0.tar.gz | |
Merge "Minor refactoring for nested try-block"1.10.0
| -rw-r--r-- | cinderclient/apiclient/base.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cinderclient/apiclient/base.py b/cinderclient/apiclient/base.py index cdf06c8..3ae5dff 100644 --- a/cinderclient/apiclient/base.py +++ b/cinderclient/apiclient/base.py @@ -491,14 +491,13 @@ class Resource(RequestIdMixin): def _add_details(self, info): for (k, v) in info.items(): try: - try: - setattr(self, k, v) - except UnicodeEncodeError: - pass - self._info[k] = v + setattr(self, k, v) except AttributeError: # In this case we already defined the attribute on the class + continue + except UnicodeEncodeError: pass + self._info[k] = v def __getattr__(self, k): if k not in self.__dict__ or k not in self._info: |