fix: remove error python2 defense code
bug #1980177 Change-Id: I5e0a79b44e5cf80c82137f000a9dbd078fc931f2
This commit is contained in:
parent
11d5abea38
commit
bc8e9e73b1
|
@ -149,7 +149,7 @@ class ProjectManager(base.CrudManager):
|
||||||
base_response.data = list_data
|
base_response.data = list_data
|
||||||
|
|
||||||
for p in 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:
|
if self.client.include_metadata:
|
||||||
base_response.data = list_data
|
base_response.data = list_data
|
||||||
|
@ -218,12 +218,12 @@ class ProjectManager(base.CrudManager):
|
||||||
dict_args = {'project_id': base.getid(project)}
|
dict_args = {'project_id': base.getid(project)}
|
||||||
url = self.build_url(dict_args_in_out=dict_args)
|
url = self.build_url(dict_args_in_out=dict_args)
|
||||||
p = self._get(url + query, self.key)
|
p = self._get(url + query, self.key)
|
||||||
p.tags = self._encode_tags(getattr(p, 'tags', []))
|
p.tags = getattr(p, 'tags', [])
|
||||||
return p
|
return p
|
||||||
|
|
||||||
def find(self, **kwargs):
|
def find(self, **kwargs):
|
||||||
p = super(ProjectManager, self).find(**kwargs)
|
p = super(ProjectManager, self).find(**kwargs)
|
||||||
p.tags = self._encode_tags(getattr(p, 'tags', []))
|
p.tags = getattr(p, 'tags', [])
|
||||||
return p
|
return p
|
||||||
|
|
||||||
def update(self, project, name=None, domain=None, description=None,
|
def update(self, project, name=None, domain=None, description=None,
|
||||||
|
@ -264,15 +264,6 @@ class ProjectManager(base.CrudManager):
|
||||||
return super(ProjectManager, self).delete(
|
return super(ProjectManager, self).delete(
|
||||||
project_id=base.getid(project))
|
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):
|
def add_tag(self, project, tag):
|
||||||
"""Add a tag to a project.
|
"""Add a tag to a project.
|
||||||
|
|
||||||
|
@ -322,7 +313,6 @@ class ProjectManager(base.CrudManager):
|
||||||
"""
|
"""
|
||||||
url = "/projects/%s/tags" % base.getid(project)
|
url = "/projects/%s/tags" % base.getid(project)
|
||||||
resp, body = self.client.get(url)
|
resp, body = self.client.get(url)
|
||||||
body['tags'] = self._encode_tags(body['tags'])
|
|
||||||
return self._prepare_return_value(resp, body['tags'])
|
return self._prepare_return_value(resp, body['tags'])
|
||||||
|
|
||||||
def check_tag(self, project, tag):
|
def check_tag(self, project, tag):
|
||||||
|
|
Loading…
Reference in New Issue