Merge branch 'jflatow-public'

Ville Tuulos · Ville Tuulos · commit 0f13a6ed06d3 · 2011-05-05T21:28:50.000-07:00
diff --git a/lib/disco/worker/classic/worker.py b/lib/disco/worker/classic/worker.py
@@ -44,6 +44,12 @@ class Worker(worker.Worker):
     :param map_init: initialization function for the map task.
                      This function is called once before the task starts.
 
+                     .. deprecated:: 0.4
+                                *map_init* has not been needed ever since
+                                :func:`InputStreams <disco.worker.classic.func.InputStream>`
+                                were introduced.
+                                Use *map_input_stream* and/or *map_reader* instead.
+
     :type  map_input_stream: sequence of :func:`disco.worker.classic.func.input_stream`
     :param map_input_stream: The given functions are chained together and the final resulting
                              :class:`disco.worker.classic.func.InputStream` object is used
@@ -90,6 +96,12 @@ class Worker(worker.Worker):
     :param reduce_init: initialization function for the reduce task.
                         This function is called once before the task starts.
 
+                     .. deprecated:: 0.4
+                                *reduce_init* has not been needed ever since
+                                :func:`InputStreams <disco.worker.classic.func.InputStream>`
+                                were introduced.
+                                Use *reduce_input_stream* and/or *reduce_reader* instead.
+
     :type  reduce_input_stream: sequence of :func:`disco.worker.classic.func.output_stream`
     :param reduce_input_stream: The given functions are chained together and the last
                               returned :class:`disco.worker.classic.func.InputStream` object is
