Merge pull request 0rpc#83 from mahendra/cleanup

Jérôme Petazzoni · Jérôme Petazzoni · commit 0a6ab3247516 · 2013-12-29T02:24:08.000-08:00
Avoid using dict as default keyword argument.

This is just for aesthetics, since those arguments are never modified in the code anyway (and unless I'm wrong, aren't modifiable outside of zerorpc's internal code) but you're right, it's good practice!
diff --git a/zerorpc/channel.py b/zerorpc/channel.py
@@ -60,13 +60,13 @@ def close(self):
         if self._channel_dispatcher_task:
             self._channel_dispatcher_task.kill()
 
-    def create_event(self, name, args, xheader={}):
+    def create_event(self, name, args, xheader=None):
         return self._events.create_event(name, args, xheader)
 
     def emit_event(self, event, identity=None):
         return self._events.emit_event(event, identity)
 
-    def emit(self, name, args, xheader={}):
+    def emit(self, name, args, xheader=None):
         return self._events.emit(name, args, xheader)
 
     def recv(self):
@@ -143,7 +143,7 @@ def close(self):
             del self._multiplexer._active_channels[self._channel_id]
             self._channel_id = None
 
-    def create_event(self, name, args, xheader={}):
+    def create_event(self, name, args, xheader=None):
         event = self._multiplexer.create_event(name, args, xheader)
         if self._channel_id is None:
             self._channel_id = event.header['message_id']
@@ -152,7 +152,7 @@ def create_event(self, name, args, xheader={}):
             event.header['response_to'] = self._channel_id
         return event
 
-    def emit(self, name, args, xheader={}):
+    def emit(self, name, args, xheader=None):
         event = self.create_event(name, args, xheader)
         self._multiplexer.emit_event(event, self._zmqid)
 
@@ -230,7 +230,7 @@ def _recver(self):
                     self.close()
                     return
 
-    def create_event(self, name, args, xheader={}):
+    def create_event(self, name, args, xheader=None):
         return self._channel.create_event(name, args, xheader)
 
     def emit_event(self, event, block=True, timeout=None):
@@ -247,7 +247,7 @@ def emit_event(self, event, block=True, timeout=None):
             raise
         return True
 
-    def emit(self, name, args, xheader={}, block=True, timeout=None):
+    def emit(self, name, args, xheader=None, block=True, timeout=None):
         event = self.create_event(name, args, xheader)
         return self.emit_event(event, block, timeout)
 
diff --git a/zerorpc/events.py b/zerorpc/events.py
@@ -226,7 +226,8 @@ def bind(self, endpoint, resolve=True):
             r.append(self._socket.bind(endpoint_))
         return r
 
-    def create_event(self, name, args, xheader={}):
+    def create_event(self, name, args, xheader=None):
+        xheader = {} if xheader is None else xheader
         event = Event(name, args, context=self._context)
         for k, v in xheader.items():
             if k == 'zmqid':
@@ -244,7 +245,8 @@ def emit_event(self, event, identity=None):
             parts = (event.pack(),)
         self._send(parts)
 
-    def emit(self, name, args, xheader={}):
+    def emit(self, name, args, xheader=None):
+        xheader = {} if xheader is None else xheader
         event = self.create_event(name, args, xheader)
         identity = xheader.get('zmqid', None)
         return self.emit_event(event, identity)
@@ -282,7 +284,8 @@ def close(self):
     def recv_is_available(self):
         return self._channel.recv_is_available
 
-    def create_event(self, name, args, xheader={}):
+    def create_event(self, name, args, xheader=None):
+        xheader = {} if xheader is None else xheader
         event = Event(name, args, self._channel.context)
         event.header.update(xheader)
         return event
@@ -292,7 +295,7 @@ def emit_event(self, event, identity=None):
         wrapper_event = self._channel.create_event('w', event_payload)
         self._channel.emit_event(wrapper_event)
 
-    def emit(self, name, args, xheader={}):
+    def emit(self, name, args, xheader=None):
         wrapper_event = self.create_event(name, args, xheader)
         self.emit_event(wrapper_event)
 
diff --git a/zerorpc/heartbeat.py b/zerorpc/heartbeat.py
@@ -100,7 +100,7 @@ def _lost_remote_exception(self):
         return LostRemote('Lost remote after {0}s heartbeat'.format(
             self._heartbeat_freq * 2))
 
-    def create_event(self, name, args, xheader={}):
+    def create_event(self, name, args, xheader=None):
         if self._compat_v2 and name == '_zpc_more':
             name = '_zpc_hb'
         return self._channel.create_event(name, args, xheader)
@@ -110,7 +110,7 @@ def emit_event(self, event):
             raise self._lost_remote_exception()
         self._channel.emit_event(event)
 
-    def emit(self, name, args, xheader={}):
+    def emit(self, name, args, xheader=None):
         event = self.create_event(name, args, xheader)
         self.emit_event(event)
 
