Skip to content

allow for username and password to be default again - fixes #96 #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 27, 2016
Merged

allow for username and password to be default again - fixes #96 #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions rabbitpy/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@

"""
import logging
# pylint: disable=import-error
try:
from urllib import parse as urlparse
except ImportError:
import urlparse

try:
import ssl
except ImportError:
Expand Down Expand Up @@ -512,8 +518,8 @@ def _process_url(self, url):
'host': parsed.hostname,
'port': parsed.port or scheme_port,
'virtual_host': utils.unquote(vhost),
'username': parsed.username or self.GUEST,
'password': parsed.password or self.GUEST,
'username': urlparse.unquote(parsed.username or self.GUEST),
'password': urlparse.unquote(parsed.password or self.GUEST),
'timeout': self._qargs_int('timeout', qargs, self.DEFAULT_TIMEOUT),
'heartbeat': self._qargs_int('heartbeat', qargs,
self.DEFAULT_HEARTBEAT_INTERVAL),
Expand Down
4 changes: 2 additions & 2 deletions rabbitpy/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ def urlparse(url):
parsed = _urlparse.urlparse(value)
return Parsed(parsed.scheme.replace('http', 'amqp'), parsed.netloc,
parsed.path, parsed.params, parsed.query, parsed.fragment,
_urlparse.unquote(parsed.username),
_urlparse.unquote(parsed.password),
parsed.username,
parsed.password,
parsed.hostname, parsed.port)


Expand Down