sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-13 16:23:50 +03:00
Code Activity

python compat: remove text_type

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
This commit is contained in:
Douglas Bagnall
2020-07-04 14:27:06 +12:00
committed by Noel Power
parent ace5038031
commit f0860de5bb
19 changed files with 21 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
python/samba/gp_parse/gp_csv.py
View File

@@ -24,7 +24,6 @@ import io
from io import BytesIO
from xml.etree.ElementTree import Element, SubElement
from samba.gp_parse import GPParser
from samba.compat import text_type
# [MS-GPAC] Group Policy Audit Configuration
class GPAuditCsvParser(GPParser):
encoding = 'utf-8'
@@ -81,14 +80,14 @@ class GPAuditCsvParser(GPParser):
header = False
self.header = []
for v in r.findall('Value'):
if not isinstance(v.text, text_type):
if not isinstance(v.text, str):
v.text = v.text.decode(self.output_encoding)
self.header.append(v.text)
else:
line = {}
for i, v in enumerate(r.findall('Value')):
line[self.header[i]] = v.text if v.text is not None else ''
if not isinstance(self.header[i], text_type):
if not isinstance(self.header[i], str):
line[self.header[i]] = line[self.header[i]].decode(self.output_encoding)
self.lines.append(line)