jamie/wavinfo
1
0
Fork 0
mirror of https://github.com/iluvcapra/wavinfo.git synced 2026-01-02 01:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed premature decoding of iXML bytes

Browse Source
This commit is contained in:
Jamie Hardt
2019-01-02 00:17:20 -08:00
parent 9f943aeb61
commit 3e897d030c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wavinfo/wave_ixml_reader.py
View File

@@ -1,4 +1,5 @@
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
import io
class WavIXMLFormat: class WavIXMLFormat:
""" """
@@ -6,17 +7,18 @@ class WavIXMLFormat:
""" """
def __init__(self, xml): def __init__(self, xml):
self.source = xml self.source = xml
self.parsed = ET.fromstring(xml) xmlBytes = io.BytesIO(xml)
self.parsed = ET.parse(xmlBytes)
def _get_text_value(self, xpath): def _get_text_value(self, xpath):
e = self.parsed.find("./" + xpath) e = self.parsed.find("./" + xpath)
if e is not None: if e is not None:
return e.text return e.text
@property @property
def project(self): def project(self):
return self._get_text_value("PROJECT") return self._get_text_value("PROJECT")
@property @property
def scene(self): def scene(self):
return self._get_text_value("SCENE") return self._get_text_value("SCENE")

2
wavinfo/wave_reader.py
View File

@@ -118,7 +118,7 @@ class WavInfoReader():
if ixml_data is None: if ixml_data is None:
return None return None
ixml_string = ixml_data.decode('utf-8') ixml_string = ixml_data
return WavIXMLFormat(ixml_string) return WavIXMLFormat(ixml_string)