Project

General

Profile

« Previous | Next » 

Revision 14589

fix: lib/sql_io.py: append_csv(): use new csvs.ProgressInputFilter instead of streams.ProgressInputStream(csvs.StreamFilter(__)), so that the input to csvs.InputRewriter is a reader, not a stream. this avoids the need for csvs.InputRewriter to accept a stream whose lines are tuples, instead of the expected reader.

View differences:

trunk/lib/sql_io.py
256 256
    
257 257
    # Wrap in standardizing stream
258 258
    cols_ct = len(header)
259
    stream = csvs.InputRewriter(streams.ProgressInputStream(csvs.StreamFilter(
260
        csvs.ColCtFilter(reader, cols_ct)), sys.stderr, msg='Read %d row(s)',
261
        n=1000))
259
    stream = csvs.InputRewriter(csvs.ProgressInputFilter(
260
        csvs.ColCtFilter(reader, cols_ct), sys.stderr, n=1000))
262 261
    #streams.copy(stream, sys.stderr) # to troubleshoot copy_expert() errors
263 262
    dialect = stream.dialect # use default dialect
264 263
    

Also available in: Unified diff