diff --git a/wgmaster/export.py b/wgmaster/export.py index a66fdd2..07dd024 100644 --- a/wgmaster/export.py +++ b/wgmaster/export.py @@ -139,9 +139,10 @@ def main() -> None: cols = [t[0] for t in cur.description] with utils.csv_open(f'{args.output}/{t_name}.csv') as f: - f.header(cols) + f.header(*cols) for row in cur: - f.row((utils.convert_value(val, table=t_name, column=col) for col, val in zip(cols, row)), raw=True) + values = (utils.convert_value(val, table=t_name, column=col) for col, val in zip(cols, row)) + f.row(*values, raw=True) print(f'Exported {t_name} successfully!', flush=True) finally: diff --git a/wgmaster/utils.py b/wgmaster/utils.py index 572c1d4..c84b9bc 100644 --- a/wgmaster/utils.py +++ b/wgmaster/utils.py @@ -56,8 +56,8 @@ class CsvFile: def __init__(self, file: TextIO): self.file = file - self.writer = csv.writer(self.file, doublequote=False, quoting=csv.QUOTE_NONE, escapechar=None) - self.reader = csv.reader(self.file, doublequote=False, quoting=csv.QUOTE_NONE, escapechar=None) + self.writer = csv.writer(self.file, doublequote=False, quoting=csv.QUOTE_NONE, escapechar='\\', quotechar=None) + self.reader = csv.reader(self.file, doublequote=False, quoting=csv.QUOTE_NONE, escapechar='\\', quotechar=None) def __enter__(self) -> CsvFile: return self