summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2012-07-24 14:56:04 +0100
committerAsk Solem <ask@celeryproject.org>2012-07-24 14:56:04 +0100
commit323136930db86f2920c89f67c87037ee39ff2762 (patch)
treee2a800df437b4027d3b365ca76a374d3d0ab5834
parent7d6525570fcd7c75e9b26df19a8a696163d1347e (diff)
downloadpy-amqp-323136930db86f2920c89f67c87037ee39ff2762.tar.gz
Removes internal argument to exchange_declare
-rw-r--r--amqp/channel.py35
1 files changed, 2 insertions, 33 deletions
diff --git a/amqp/channel.py b/amqp/channel.py
index 2a41dc3..dae5c28 100644
--- a/amqp/channel.py
+++ b/amqp/channel.py
@@ -443,19 +443,9 @@ class Channel(AbstractChannel):
# the system exchange, the server MUST raise a connection
# exception with reply code 507 (not allowed).
#
- # RULE:
- #
- # The default exchange MUST be defined as internal, and be
- # inaccessible to the client except by specifying an empty
- # exchange name in a content Publish method. That is, the
- # server MUST NOT let clients make explicit bindings to this
- # exchange.
- #
- #
def exchange_declare(self, exchange, type, passive=False, durable=False,
- auto_delete=True, internal=False, nowait=False,
- arguments=None):
+ auto_delete=True, nowait=False, arguments=None):
"""Declare exchange, create if needed
This method creates an exchange if it does not already exist,
@@ -558,15 +548,6 @@ class Channel(AbstractChannel):
The server MUST ignore the auto-delete field if
the exchange already exists.
- internal: boolean
-
- create internal exchange
-
- If set, the exchange may not be used directly by
- publishers, but only when bound to other exchanges.
- Internal exchanges are used to construct wiring that
- is not visible to applications.
-
nowait: boolean
do not send a reply method
@@ -594,7 +575,7 @@ class Channel(AbstractChannel):
args.write_bit(passive)
args.write_bit(durable)
args.write_bit(auto_delete)
- args.write_bit(internal)
+ args.write_bit(False) # internal: deprecated
args.write_bit(nowait)
args.write_table(arguments)
self._send_method((40, 10), args)
@@ -743,12 +724,6 @@ class Channel(AbstractChannel):
RULE:
- If the client attempts to an exchange that was declared as
- internal, the server MUST raise a connection exception
- with reply code 530 (not allowed).
-
- RULE:
-
The server SHOULD support at least 4 bindings per queue,
and ideally, impose no limit except as defined by
available resources.
@@ -1888,12 +1863,6 @@ class Channel(AbstractChannel):
RULE:
- If the exchange was declared as an internal
- exchange, the server MUST raise a channel
- exception with a reply code 403 (access refused).
-
- RULE:
-
The exchange MAY refuse basic content in which
case it MUST raise a channel exception with reply
code 540 (not implemented).