Merge branch 'aeirola-master'

pika · May 20, 2015 · 851ee1c · 851ee1c
2 parents 0174fb8 + c81f02c
commit 851ee1c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/pika/channel.py b/pika/channel.py
@@ -998,8 +998,10 @@ def _on_return(self, method_frame, header_frame, body):
 
         """
         if not self.callbacks.process(self.channel_number, '_on_return', self,
-                                      (self, method_frame.method,
-                                       header_frame.properties, body)):
+                                      self,
+                                      method_frame.method,
+                                      header_frame.properties,
+                                      body):
             LOGGER.warning('Basic.Return received from server (%r, %r)',
                            method_frame.method, header_frame.properties)
 

diff --git a/tests/unit/channel_tests.py b/tests/unit/channel_tests.py
@@ -1120,10 +1120,13 @@ def test_onreturn(self):
         header_value = frame.Header(1, 10, spec.BasicProperties())
         body_value = frame.Body(1, b'0123456789')
         self.obj._on_return(method_value, header_value, body_value)
-        self.obj.callbacks.process.assert_called_with(
-            self.obj.channel_number, '_on_return', self.obj,
-            (self.obj, method_value.method, header_value.properties,
-             body_value))
+        self.obj.callbacks.process.assert_called_with(self.obj.channel_number,
+                                                      '_on_return',
+                                                      self.obj,
+                                                      self.obj,
+                                                      method_value.method,
+                                                      header_value.properties,
+                                                      body_value)
 
     @mock.patch('logging.Logger.warning')
     def test_onreturn_warning(self, warning):