components/python/amqp/patches/auto_delete-ok.patch
branchs11u2-sru
changeset 4156 4b1def16fe9b
equal deleted inserted replaced
4146:097063f324c0 4156:4b1def16fe9b
       
     1 This patch removes a deprecation about using auto_delete with exchanges
       
     2 as RabbitMQ intends to support it going forward as an extension to AMQP
       
     3 0-9-1. It is not suitable for the upstream.
       
     4 
       
     5 --- amqp-1.4.6/amqp/channel.py.orig	2014-08-11 09:56:50.000000000 -0700
       
     6 +++ amqp-1.4.6/amqp/channel.py	2015-02-03 17:28:07.424050361 -0800
       
     7 @@ -31,11 +31,6 @@ __all__ = ['Channel']
       
     8  
       
     9  AMQP_LOGGER = logging.getLogger('amqp')
       
    10  
       
    11 -EXCHANGE_AUTODELETE_DEPRECATED = """\
       
    12 -The auto_delete flag for exchanges has been deprecated and will be removed
       
    13 -from py-amqp v1.5.0.\
       
    14 -"""
       
    15 -
       
    16  
       
    17  class VDeprecationWarning(DeprecationWarning):
       
    18      pass
       
    19 @@ -612,9 +607,6 @@ class Channel(AbstractChannel):
       
    20          args.write_table(arguments)
       
    21          self._send_method((40, 10), args)
       
    22  
       
    23 -        if auto_delete:
       
    24 -            warn(VDeprecationWarning(EXCHANGE_AUTODELETE_DEPRECATED))
       
    25 -
       
    26          if not nowait:
       
    27              return self.wait(allowed_methods=[
       
    28                  (40, 11),  # Channel.exchange_declare_ok