diff options
| author | Wenxiang Wu <wu.wenxiang@99cloud.net> | 2022-06-29 12:03:28 +0800 |
|---|---|---|
| committer | Wu Wenxiang <wu.wenxiang@99cloud.net> | 2022-07-06 11:34:02 +0800 |
| commit | bc8e9e73b1ecbcf9cae8c5bfe013c68469b60cef (patch) | |
| tree | 2e7b6e2703f652203b0e9baedcb06ce4a9e69468 | |
| parent | 11d5abea3845e1bd358d2d6dc95df4ff7aa146d3 (diff) | |
| download | python-keystoneclient-bc8e9e73b1ecbcf9cae8c5bfe013c68469b60cef.tar.gz | |
fix: remove error python2 defense code5.0.1
bug #1980177
Change-Id: I5e0a79b44e5cf80c82137f000a9dbd078fc931f2
| -rw-r--r-- | keystoneclient/v3/projects.py | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/keystoneclient/v3/projects.py b/keystoneclient/v3/projects.py index edaf982..9cae850 100644 --- a/keystoneclient/v3/projects.py +++ b/keystoneclient/v3/projects.py @@ -149,7 +149,7 @@ class ProjectManager(base.CrudManager): base_response.data = list_data for p in list_data: - p.tags = self._encode_tags(getattr(p, 'tags', [])) + p.tags = getattr(p, 'tags', []) if self.client.include_metadata: base_response.data = list_data @@ -218,12 +218,12 @@ class ProjectManager(base.CrudManager): dict_args = {'project_id': base.getid(project)} url = self.build_url(dict_args_in_out=dict_args) p = self._get(url + query, self.key) - p.tags = self._encode_tags(getattr(p, 'tags', [])) + p.tags = getattr(p, 'tags', []) return p def find(self, **kwargs): p = super(ProjectManager, self).find(**kwargs) - p.tags = self._encode_tags(getattr(p, 'tags', [])) + p.tags = getattr(p, 'tags', []) return p def update(self, project, name=None, domain=None, description=None, @@ -264,15 +264,6 @@ class ProjectManager(base.CrudManager): return super(ProjectManager, self).delete( project_id=base.getid(project)) - def _encode_tags(self, tags): - """Encode tags to non-unicode string in python2. - - :param tags: list of unicode tags - - :returns: List of strings - """ - return [str(t) for t in tags] - def add_tag(self, project, tag): """Add a tag to a project. @@ -322,7 +313,6 @@ class ProjectManager(base.CrudManager): """ url = "/projects/%s/tags" % base.getid(project) resp, body = self.client.get(url) - body['tags'] = self._encode_tags(body['tags']) return self._prepare_return_value(resp, body['tags']) def check_tag(self, project, tag): |