Rename bufchan to channel

bombela · bombela · commit 36bcecd94ac6 · 2014-09-10T01:51:36.000-07:00
After all, we are dealing with an abstract channel, no need to know if
its buffered or not in the patterns.
diff --git a/zerorpc/patterns.py b/zerorpc/patterns.py
@@ -25,66 +25,66 @@
 
 class ReqRep:
 
-    def process_call(self, context, bufchan, req_event, functor):
+    def process_call(self, context, channel, req_event, functor):
         context.hook_server_before_exec(req_event)
         result = functor(*req_event.args)
-        rep_event = bufchan.create_event('OK', (result,),
+        rep_event = channel.create_event('OK', (result,),
                 context.hook_get_task_context())
         context.hook_server_after_exec(req_event, rep_event)
-        bufchan.emit_event(rep_event)
+        channel.emit_event(rep_event)
 
     def accept_answer(self, event):
         return True
 
-    def process_answer(self, context, bufchan, req_event, rep_event,
+    def process_answer(self, context, channel, req_event, rep_event,
             handle_remote_error):
         if rep_event.name == 'ERR':
             exception = handle_remote_error(rep_event)
             context.hook_client_after_request(req_event, rep_event, exception)
             raise exception
         context.hook_client_after_request(req_event, rep_event)
-        bufchan.close()
+        channel.close()
         result = rep_event.args[0]
         return result
 
 
 class ReqStream:
 
-    def process_call(self, context, bufchan, req_event, functor):
+    def process_call(self, context, channel, req_event, functor):
         context.hook_server_before_exec(req_event)
         xheader = context.hook_get_task_context()
         for result in iter(functor(*req_event.args)):
-            bufchan.emit('STREAM', result, xheader)
-        done_event = bufchan.create_event('STREAM_DONE', None, xheader)
+            channel.emit('STREAM', result, xheader)
+        done_event = channel.create_event('STREAM_DONE', None, xheader)
         # NOTE: "We" made the choice to call the hook once the stream is done,
         # the other choice was to call it at each iteration. I don't think that
         # one choice is better than the other, so I'm fine with changing this
         # or adding the server_after_iteration and client_after_iteration hooks.
         context.hook_server_after_exec(req_event, done_event)
-        bufchan.emit_event(done_event)
+        channel.emit_event(done_event)
 
     def accept_answer(self, event):
         return event.name in ('STREAM', 'STREAM_DONE')
 
-    def process_answer(self, context, bufchan, req_event, rep_event,
+    def process_answer(self, context, channel, req_event, rep_event,
             handle_remote_error):
 
         def is_stream_done(rep_event):
             return rep_event.name == 'STREAM_DONE'
-        bufchan.on_close_if = is_stream_done
+        channel.on_close_if = is_stream_done
 
         def iterator(req_event, rep_event):
             while rep_event.name == 'STREAM':
                 # Like in process_call, we made the choice to call the
                 # after_exec hook only when the stream is done.
                 yield rep_event.args
-                rep_event = bufchan.recv()
+                rep_event = channel.recv()
             if rep_event.name == 'ERR':
                 exception = handle_remote_error(rep_event)
                 context.hook_client_after_request(req_event, rep_event, exception)
                 raise exception
             context.hook_client_after_request(req_event, rep_event)
-            bufchan.close()
+            channel.close()
 
         return iterator(req_event, rep_event)
 
