Skip to content

Commit

Permalink
Fixes outdated Connection docstring
Browse files Browse the repository at this point in the history
  • Loading branch information
ask committed Apr 22, 2016
1 parent 85f7f03 commit f838663
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions kombu/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,6 @@ class Connection(object):
SSL currently only works with the py-amqp, amqplib, and qpid
transports. For other transports you can use stunnel.
:keyword hostname: Default host name/address if not provided in the URL.
:keyword userid: Default user name if not provided in the URL.
:keyword password: Default password if not provided in the URL.
:keyword virtual_host: Default virtual host if not provided in the URL.
:keyword port: Default port if not provided in the URL.
:keyword ssl: Use SSL to connect to the server. Default is ``False``.
May not be supported by the specified transport.
:keyword transport: Default transport if not specified in the URL.
Expand All @@ -98,6 +93,19 @@ class Connection(object):
>>> conn.release()
*Legacy options*
These options have been replaced by the URL argument, but are still
supported for backwards compatibility:
:keyword hostname: Host name/address.
NOTE: You cannot specify both the URL argument and use the hostname
keyword argument at the same time.
:keyword userid: Default user name if not provided in the URL.
:keyword password: Default password if not provided in the URL.
:keyword virtual_host: Default virtual host if not provided in the URL.
:keyword port: Default port if not provided in the URL.
"""
port = None
virtual_host = '/'
Expand Down

0 comments on commit f838663

Please sign in to comment.