YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Python3 migration for export user feature

Browse source
This commit is contained in:
ljf 2021-05-08 23:39:33 +02:00
parent a78e4c8eac
commit 1d33f333cd
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/yunohost/user.py
View file

@ -616,8 +616,8 @@ def user_export():
""" """
import csv # CSV are needed only in this function import csv # CSV are needed only in this function
from io import BytesIO from io import StringIO
with BytesIO() as csv_io: with StringIO() as csv_io:
writer = csv.DictWriter(csv_io, CSV_FIELDNAMES, writer = csv.DictWriter(csv_io, CSV_FIELDNAMES,
delimiter=';', quotechar='"') delimiter=';', quotechar='"')
writer.writeheader() writer.writeheader()
@ -677,7 +677,7 @@ def user_import(operation_logger, csvfile, update=False, delete=False):
format_errors = [key + ':' + str(user[key]) format_errors = [key + ':' + str(user[key])
for key, validator in VALIDATORS.items() for key, validator in VALIDATORS.items()
if user[key] is None or not re.match(validator, user[key])] if user[key] is None or not re.match(validator, user[key])]
except KeyError, e: except KeyError as e:
logger.error(m18n.n('user_import_missing_column', logger.error(m18n.n('user_import_missing_column',
column=str(e))) column=str(e)))
is_well_formatted = False is_well_formatted = False