Merge lp:~gz/bzr-svn/unicode_password_prompt_1076386 into lp:bzr-svn

[Martin Packman]

Fix prompting for passwords against newer bzr versions which have become strict about ui-level strings actually being unicode rather than bytestrings. Core bzr should possibly make allowances for old plugins that are lax about this, but since at least 2.2 TextUIFactory.prompt has tried to encode the string using the terminal encoding, which would blow up with non-ascii bytestrings.

The branch also adds a new tests.test_auth module as the current auth module seems to be untested at present.

[Jelmer Vernooij (jelmer)]

Looks good, please land. :-) Can you add an entry in NEWS as well?

review: Approve (code)

[lp:~gz/bzr-svn/unicode_password_prompt_1076386]

4198. By Martin Packman on 2012-11-09

Add NEWS

[Martin Packman (gz)]

News added. I don't have push rights to lp:bzr-svn though, do you have some other means of landing?

[Jelmer Vernooij (jelmer)]

On Fri, 2012-11-09 at 12:08 +0000, Martin Packman wrote:
> News added. I don't have push rights to lp:bzr-svn though, do you have some other means of landing?
You're now a member of ~bzr-svn. Have fun. (-:

Cheers,

Jelmer

=== modified file 'NEWS'
--- NEWS	2012-06-28 11:09:23 +0000
+++ NEWS	2012-11-09 12:05:26 +0000
@@ -5,6 +5,9 @@
   * Support show_base argument to ``WorkingTree.pull``.
     (Jelmer Vernooij, #1018797)
 
+  * Use unicode string for password prompt fixing ValueError
+    with newer bzr versions. (Martin Packman, #1076386)
+
 bzr-svn 1.2.2					  2012-04-16
 
  BUG FIXES

=== modified file 'auth.py'
--- auth.py	2012-03-08 17:52:35 +0000
+++ auth.py	2012-11-09 12:05:26 +0000
@@ -77,7 +77,7 @@
                     host=self.host, path=self.path, realm=realm, ask=True)
         password = self.get_password(self.scheme, host=self.host,
             path=self.path, user=username,
-            realm=realm, prompt="%s %s password" % (realm, username))
+            realm=realm, prompt=u"%s %s password" % (realm, username))
         if type(password) == unicode:
             password = password.encode('utf-8')
         return (username.encode("utf-8"), password, False)

=== modified file 'tests/__init__.py'
--- tests/__init__.py	2011-11-14 14:53:05 +0000
+++ tests/__init__.py	2012-11-09 12:05:26 +0000
@@ -227,6 +227,7 @@
     suite = TestSuite()
 
     testmod_names = [
+            'test_auth',
             'test_branch',
             'test_branchprops',
             'test_cache',

=== added file 'tests/test_auth.py'
--- tests/test_auth.py	1970-01-01 00:00:00 +0000
+++ tests/test_auth.py	2012-11-09 12:05:26 +0000
@@ -0,0 +1,50 @@
+# Copyright (C) 2012 Martin Packman <[e-mail]>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+"""Tests for authentication module"""
+
+from bzrlib import (
+    tests,
+    ui,
+    )
+from bzrlib.plugins.svn.auth import (
+    SubversionAuthenticationConfig,
+    )
+
+
+class TestSubversionAuthenticationConfig(tests.TestCase):
+    """Subversion specific authentication.conf handling tests"""
+
+    def override_ui(self, stdin):
+        stdout = tests.StringIOWrapper()
+        stderr = tests.StringIOWrapper()
+        ui.ui_factory = tests.TestUIFactory(stdin=stdin, stdout=stdout,
+            stderr=stderr)
+        return stdout, stderr
+
+    def test_get_svn_simple(self):
+        username, password = "a-user", "a-secret"
+        realm = "REALM" # what does this mean in the context of svn?
+        stdout, stderr = self.override_ui(password + "\n")
+        conf = SubversionAuthenticationConfig("svn", username, None, None)
+        got_user, got_pass, _ = conf.get_svn_simple(realm, username, True)
+        self.assertIsInstance(got_user, str)
+        self.assertEquals(username, got_user)
+        self.assertIsInstance(got_pass, str)
+        self.assertEquals(password, got_pass)
+        self.assertEquals("%s %s password: " % (realm, username),
+            stderr.getvalue())
+        self.assertEquals("", stdout.getvalue())