openstack/python-cinderclient
Code Issues Proposed changes

Merge "Minor refactoring for nested try-block"

Browse Source
This commit is contained in:
Jenkins
2016-12-23 18:59:17 +00:00
committed by Gerrit Code Review
parent ef950289d8 5d692deb7f
commit 4eb63b8ef2
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cinderclient/apiclient/base.py
View File

@@ -491,14 +491,13 @@ class Resource(RequestIdMixin):
def _add_details(self, info): def _add_details(self, info):
for (k, v) in info.items(): for (k, v) in info.items():
try: try:
try: setattr(self, k, v)
setattr(self, k, v)
except UnicodeEncodeError:
pass
self._info[k] = v
except AttributeError: except AttributeError:
# In this case we already defined the attribute on the class # In this case we already defined the attribute on the class
continue
except UnicodeEncodeError:
pass pass
self._info[k] = v
def __getattr__(self, k): def __getattr__(self, k):
if k not in self.__dict__ or k not in self._info: if k not in self.__dict__ or k not in self._info: