openstack/venus
Code Issues Proposed changes

remove six module in venus/api/xmlutil.py

Browse Source 
Change-Id: I36330dee1494af521a81a5aa01a9fd92726d7923
This commit is contained in:
kuangcx 2020-12-22 18:55:41 -08:00
parent d051d38089
commit 2feca2141f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
venus/api/xmlutil.py
View File

@ -17,7 +17,6 @@ import os.path
import re import re
from lxml import etree from lxml import etree
import six
from venus.i18n import _ from venus.i18n import _
from venus import utils from venus import utils
@ -205,7 +204,7 @@ class TemplateElement(object):
def __getitem__(self, idx): def __getitem__(self, idx):
"""Retrieve a child node by index or name.""" """Retrieve a child node by index or name."""
if isinstance(idx, six.string_types): if isinstance(idx, str):
# Allow access by node name # Allow access by node name
return self._childmap[idx] return self._childmap[idx]
else: else:
@ -336,12 +335,12 @@ class TemplateElement(object):
# Start with the text... # Start with the text...
if self.text is not None: if self.text is not None:
elem.text = six.text_type(self.text(obj)) elem.text = str(self.text(obj))
# Now set up all the attributes... # Now set up all the attributes...
for key, value in self.attrib.items(): for key, value in self.attrib.items():
try: try:
elem.set(key, six.text_type(value(obj, True))) elem.set(key, str(value(obj, True)))
except KeyError: except KeyError:
# Attribute has no value, so don't include it # Attribute has no value, so don't include it
pass pass