openstack/virtualbmc
Code Issues Proposed changes

Remove version check for encoding

Browse Source 
Virtualbmc is now Python 3 only, encoding for ET can be set to
unicode only.
Removing import sys from vbmc.py as it was used only for that
check.

Change-Id: I35ac19308337f9fb603efa5b8a3dc97aea234cbc
This commit is contained in:
Riccardo Pittau 2019-12-12 12:47:03 +01:00
parent 26b7ff6063
commit 3ef73c8d8f
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
virtualbmc/vbmc.py
View File

@ -10,7 +10,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import sys
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
import libvirt import libvirt
@ -103,11 +102,7 @@ class VirtualBMC(bmc.Bmc):
boot_element = ET.SubElement(os_element, 'boot') boot_element = ET.SubElement(os_element, 'boot')
boot_element.set('dev', device) boot_element.set('dev', device)
# conn.defineXML can't take bytes but conn.defineXML(ET.tostring(tree, encoding="unicode"))
# in py3 ET.tostring returns bytes unless "unicode"
# in py2 "unicode" is unknown so specify "utf8" instead
enc = sys.version_info[0] < 3 and "utf8" or "unicode"
conn.defineXML(ET.tostring(tree, encoding=enc))
except libvirt.libvirtError: except libvirt.libvirtError:
LOG.error('Failed setting the boot device %(bootdev)s for ' LOG.error('Failed setting the boot device %(bootdev)s for '
'domain %(domain)s', {'bootdev': device, 'domain %(domain)s', {'bootdev': device,