Skip to content

Commit 9c6941a

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Remove bash-completion calls from base.py"
2 parents 8d6a89f + 0707191 commit 9c6941a

1 file changed

Lines changed: 3 additions & 9 deletions

File tree

cinderclient/base.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,8 @@ def _list(self, url, response_key, obj_class=None, body=None,
9191
except KeyError:
9292
pass
9393

94-
# FIXME(eharney): This is probably a bug - we should only call
95-
# completion_cache for the shell, not here.
96-
with self.completion_cache('human_id', obj_class, mode="w"):
97-
with self.completion_cache('uuid', obj_class, mode="w"):
98-
items_new = [obj_class(self, res, loaded=True)
99-
for res in data if res]
94+
items_new = [obj_class(self, res, loaded=True)
95+
for res in data if res]
10096
if limit:
10197
limit = int(limit)
10298
margin = limit - len(items)
@@ -330,9 +326,7 @@ def _create(self, url, body, response_key, return_raw=False, **kwargs):
330326
if return_raw:
331327
return common_base.DictWithMeta(body[response_key], resp)
332328

333-
with self.completion_cache('human_id', self.resource_class, mode="a"):
334-
with self.completion_cache('uuid', self.resource_class, mode="a"):
335-
return self.resource_class(self, body[response_key], resp=resp)
329+
return self.resource_class(self, body[response_key], resp=resp)
336330

337331
def _delete(self, url):
338332
resp, body = self.api.client.delete(url)

0 commit comments

Comments
 (0)