diff options
author | Ted Ross <tross@apache.org> | 2009-02-12 18:10:23 +0000 |
---|---|---|
committer | Ted Ross <tross@apache.org> | 2009-02-12 18:10:23 +0000 |
commit | 64b26d7ac98b821e176f97d96a6580dafac353f6 (patch) | |
tree | e050e72534edd9d246b26506291002b81575361d | |
parent | 6b4f3c57a9cbaa808e66cd284af90a70da7172e1 (diff) | |
download | qpid-python-64b26d7ac98b821e176f97d96a6580dafac353f6.tar.gz |
Remove unicode when dealing with usernames and passwords in URLs.
This solves a problem seen with qpid-route when credentials are supplied.
A test was added to regression test.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@743819 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-x | qpid/cpp/src/tests/cli_tests.py | 2 | ||||
-rw-r--r-- | qpid/python/qmf/console.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/cli_tests.py b/qpid/cpp/src/tests/cli_tests.py index 2f4f41eab5..a6304e8b3e 100755 --- a/qpid/cpp/src/tests/cli_tests.py +++ b/qpid/cpp/src/tests/cli_tests.py @@ -150,7 +150,7 @@ class CliTests(TestBase010): self.startQmf(); qmf = self.qmf - command = cli_dir() + "/qpid-route dynamic add localhost:%d %s:%d amq.topic" %\ + command = cli_dir() + "/qpid-route dynamic add guest/guest@localhost:%d %s:%d amq.topic" %\ (testrunner.port, remote_host(), remote_port()) ret = os.system(command) self.assertEqual(ret, 0) diff --git a/qpid/python/qmf/console.py b/qpid/python/qmf/console.py index 49f920aa51..ed25c77acc 100644 --- a/qpid/python/qmf/console.py +++ b/qpid/python/qmf/console.py @@ -96,8 +96,8 @@ class BrokerURL(URL): self.port = 5671 else: self.port = 5672 - self.authName = self.user or "guest" - self.authPass = self.password or "guest" + self.authName = str(self.user) or "guest" + self.authPass = str(self.password) or "guest" self.authMech = "PLAIN" def name(self): |