changed the default reader from map_line_reader to None (which return…

…s an iter over the fd)
erans · Nov 3, 2010 · 5d9150f · 5d9150f
1 parent 99d96fa
commit 5d9150f
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/lib/disco/core.py b/lib/disco/core.py
@@ -700,7 +700,7 @@ class JobDict(util.DefaultDict):
     defaults = {'input': (),
                 'map': None,
                 'map_init': func.noop,
-                'map_reader': func.map_line_reader,
+                'map_reader': None,
                 'map_input_stream': (func.map_input_stream, ),
                 'map_output_stream': (func.map_output_stream,
                                       func.disco_output_stream),

diff --git a/tests/test_chain.py b/tests/test_chain.py
@@ -22,7 +22,7 @@ def getdata_1(self, path):
 
     @staticmethod
     def map_1(e, params):
-        yield e + params['suffix'], 0
+        yield e.strip() + params['suffix'], 0
 
     @staticmethod
     def reduce_1(iter, out, params):

diff --git a/tests/test_mapresults.py b/tests/test_mapresults.py
@@ -20,7 +20,7 @@ def input_2(self):
     def map_1(e, params):
         if type(e) == tuple:
             e = e[0]
-        yield (e + "!", '')
+        yield (e.strip() + "!", '')
 
     @staticmethod
     def reduce_1(iter, out, params):

diff --git a/tests/test_objectrw.py b/tests/test_objectrw.py
@@ -16,7 +16,7 @@ def getdata(self, path):
 
     @staticmethod
     def map(e, params):
-        return [({'PI': math.pi}, time.strptime(e, '%d/%m/%Y'))]
+        return [({'PI': math.pi}, time.strptime(e.strip(), '%d/%m/%Y'))]
 
     @staticmethod
     def reduce(iter, out, params):

diff --git a/tests/test_onlymap.py b/tests/test_onlymap.py
@@ -10,7 +10,7 @@ def getdata(self, path):
 
     @staticmethod
     def map(e, params):
-        return [(e, 1)]
+        return [(e.strip(), 1)]
 
     def runTest(self):
         d = {}

diff --git a/tests/test_save.py b/tests/test_save.py
@@ -52,7 +52,7 @@ def input_2(self):
     def map_1(e, params):
         if type(e) == tuple:
             e = e[0]
-        yield (e + "!", '')
+        yield (e.strip() + "!", '')
 
     map_2 = map_1
 

diff --git a/tests/test_writers.py b/tests/test_writers.py
@@ -9,7 +9,8 @@ def getdata(self, path):
 
     @staticmethod
     def map(e, params):
-        return [('=' + e, e)]
+        e = e.strip()
+        yield '=' + e, e
 
     @staticmethod
     def map_writer(fd, key, value, params):