Merge pull request #1216 from pika/lrb-fix-exception-and-example

Fix use of InvalidChannelNumber exception
pika · Jun 11, 2019 · 24e6c9a · 24e6c9a
2 parents a3972b9 + 9c3e2fe
commit 24e6c9a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/docs/intro.rst b/docs/intro.rst
@@ -58,7 +58,7 @@ Example::
     def on_connected(connection):
         """Called when we are fully connected to RabbitMQ"""
         # Open a channel
-        connection.channel(on_channel_open)
+        connection.channel(on_open_callback=on_channel_open)
 
     # Step #3
     def on_channel_open(new_channel):
@@ -79,7 +79,7 @@ Example::
 
     # Step #1: Connect to RabbitMQ using the default parameters
     parameters = pika.ConnectionParameters()
-    connection = pika.SelectConnection(parameters, on_connected)
+    connection = pika.SelectConnection(parameters, on_open_callback=on_connected)
 
     try:
         # Loop so we can communicate with RabbitMQ

diff --git a/pika/channel.py b/pika/channel.py
@@ -57,7 +57,7 @@ def __init__(self, connection, channel_number, on_open_callback):
 
         """
         if not isinstance(channel_number, int):
-            raise exceptions.InvalidChannelNumber
+            raise exceptions.InvalidChannelNumber(channel_number)
 
         validators.rpc_completion_callback(on_open_callback)
 

diff --git a/pika/connection.py b/pika/connection.py
@@ -1251,8 +1251,11 @@ def channel(self, channel_number=None, on_open_callback=None):
             raise exceptions.ConnectionWrongStateError(
                 'Channel allocation requires an open connection: %s' % self)
 
+        validators.rpc_completion_callback(on_open_callback)
+
         if not channel_number:
             channel_number = self._next_channel_number()
+
         self._channels[channel_number] = self._create_channel(
             channel_number, on_open_callback)
         self._add_channel_callbacks(channel_number)