sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

[processing] restore functionality of the TableWriter class (fix #16053)

Browse Source
This commit is contained in:
Alexander Bruy 2017-01-10 20:23:05 +02:00
parent e01c476e40
commit c4cc954141
1 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
python/plugins/processing/tools/vector.py
View File

@ -37,8 +37,6 @@ import re
import os
import csv
import uuid
import codecs
import io
import psycopg2
from osgeo import ogr
@ -768,42 +766,17 @@ class TableWriter(object):
if self.encoding is None or encoding == 'System':
self.encoding = 'utf-8'
with open(self.fileName, 'wb') as csvFile:
self.writer = UnicodeWriter(csvFile, encoding=self.encoding)
with open(self.fileName, 'w', newline='', encoding=self.encoding) as f:
self.writer = csv.writer(f)
if len(fields) != 0:
self.writer.writerow(fields)
def addRecord(self, values):
with open(self.fileName, 'ab') as csvFile:
self.writer = UnicodeWriter(csvFile, encoding=self.encoding)
with open(self.fileName, 'a', newline='', encoding=self.encoding) as f:
self.writer = csv.writer(f)
self.writer.writerow(values)
def addRecords(self, records):
with open(self.fileName, 'ab') as csvFile:
self.writer = UnicodeWriter(csvFile, encoding=self.encoding)
with open(self.fileName, 'a', newline='', encoding=self.encoding) as f:
self.writer = cvs.writer(f)
self.writer.writerows(records)
class UnicodeWriter(object):
def __init__(self, f, dialect=csv.excel, encoding='utf-8', **kwds):
self.queue = io.StringIO()
self.writer = csv.writer(self.queue, dialect=dialect, **kwds)
self.stream = f
self.encoder = codecs.getincrementalencoder(encoding)()
def writerow(self, row):
row = list(map(str, row))
try:
self.writer.writerow([s.encode('utf-8') for s in row])
except:
self.writer.writerow(row)
data = self.queue.getvalue()
data = data.decode('utf-8')
data = self.encoder.encode(data)
self.stream.write(data)
self.queue.truncate(0)
def writerows(self, rows):
for row in rows:
self.writerow(row)