update csv and jsonlines reader to use file handler instead of filena…

…me, update basic example
usc-isi-i2 · Mar 23, 2018 · 9bedbf4 · 9bedbf4
1 parent 6319818
commit 9bedbf4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/examples/basic/basic.py b/examples/basic/basic.py
@@ -22,9 +22,9 @@ def value(self):
         return v[0] if len(v) > 0 else 'empty'
 
 
-ds1 = rltk.Dataset(reader=rltk.CSVReader(filename='ds1.csv'),
+ds1 = rltk.Dataset(reader=rltk.CSVReader(open('ds1.csv')),
                    record_class=Record1, adapter=rltk.MemoryAdapter())
-ds2 = rltk.Dataset(reader=rltk.JsonLinesReader(filename='ds2.jl'),
+ds2 = rltk.Dataset(reader=rltk.JsonLinesReader(open('ds2.jl')),
                    record_class=Record2, adapter=rltk.DBMAdapter('file_index'))
 
 pairs = rltk.get_record_pairs(ds1, ds2)

diff --git a/examples/basic/block.jl b/examples/basic/block.jl
diff --git a/rltk/io/reader/csv_reader.py b/rltk/io/reader/csv_reader.py
@@ -1,13 +1,12 @@
 import csv
-import codecs
 
 from rltk.io.reader import Reader
 
 
 class CSVReader(Reader):
 
-    def __init__(self, filename, **kwargs):
-        self._file_handler = codecs.open(filename)
+    def __init__(self, file_handler, **kwargs):
+        self._file_handler = file_handler
         self._csv_reader = csv.DictReader(self._file_handler, **kwargs)
 
     def __next__(self):

diff --git a/rltk/io/reader/jsonlines_reader.py b/rltk/io/reader/jsonlines_reader.py
@@ -1,13 +1,12 @@
 import json
-import codecs
 
 from rltk.io.reader import Reader
 
 
 class JsonLinesReader(Reader):
 
-    def __init__(self, filename, ignore_blank_line=True):
-        self._file_handler = codecs.open(filename)
+    def __init__(self, file_handler, ignore_blank_line=True):
+        self._file_handler = file_handler
         self._ignore_blank_line = ignore_blank_line
 
     def __next__(self):