oz123 10 gadi atpakaļ
vecāks
revīzija
4395658cff
2 mainītis faili ar 7 papildinājumiem un 6 dzēšanām
  1. 5 4
      pwman/exchange/importer.py
  2. 2 2
      pwman/tests/test_importer.py

+ 5 - 4
pwman/exchange/importer.py

@@ -48,10 +48,11 @@ class CSVImporter(BaseImporter):
 
     def _read_file(self):
         """read the csv file, remove empty lines and the header"""
-        with open(self.args.import_file) as fh:
-            csv_f = csv.reader(fh, delimiter=';')
-            lines = [line for line in csv_f]
-            lines = list(filter(None, lines))
+        fh = self.args.import_file
+        import ipdb; ipdb.set_trace()  # XXX BREAKPOINT
+        csv_f = csv.reader(fh, delimiter=';')
+        lines = [line for line in csv_f]
+        lines = list(filter(None, lines))
         return lines[1:]
 
     def _create_node(self, row):

+ 2 - 2
pwman/tests/test_importer.py

@@ -41,7 +41,7 @@ class TestImporter(unittest.TestCase):
         config = {}
         db = SQLite('test-importer.db')
         Args = namedtuple('args', 'import_file')
-        self.importer = CSVImporter(Args(import_file='import_file.csv'),
+        self.importer = CSVImporter(Args(import_file=open('import_file.csv')),
                                     config, db)
 
     def test_read_file(self):
@@ -78,7 +78,7 @@ class TestImporter(unittest.TestCase):
 
         # args need import_file , db,
         Args = namedtuple('Args', 'import_file, db')
-        args = Args(import_file='import_file.csv', db='importdummy.db')
+        args = Args(import_file=open('import_file.csv'), db='importdummy.db')
         dbtype, dbver, fname = 'SQLite', 0.6, 'importdummy.db'
         db = pwman.data.factory.create(dbtype, dbver, fname)
         importer = Importer((args, '', db))