Rev 5924: Require prompts to always be unicode in http://bazaar.launchpad.net/~vila/bzr/integration/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Fri May 27 05:16:49 UTC 2011
At http://bazaar.launchpad.net/~vila/bzr/integration/
------------------------------------------------------------
revno: 5924 [merge]
revision-id: v.ladeuil+lp at free.fr-20110527051648-zmmcr3rzmskbvign
parent: pqm at pqm.ubuntu.com-20110527002226-47nfzevxy52b4pn1
parent: jelmer at samba.org-20110516140227-zmqbs24f6ezfwc4b
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Fri 2011-05-27 07:16:48 +0200
message:
Require prompts to always be unicode
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/tests/per_uifactory/__init__.py __init__.py-20090923045301-o12zypjwsidxn2hy-1
bzrlib/tests/test_script.py test_script.py-20090901081156-y90z4w2t62fv7e7b-1
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
-------------- next part --------------
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2011-05-20 14:39:50 +0000
+++ b/bzrlib/builtins.py 2011-05-27 05:16:48 +0000
@@ -4954,7 +4954,7 @@
if not force:
if not ui.ui_factory.confirm_action(
- 'Uncommit these revisions',
+ u'Uncommit these revisions',
'bzrlib.builtins.uncommit',
{}):
self.outf.write('Canceled\n')
=== modified file 'bzrlib/lockdir.py'
--- a/bzrlib/lockdir.py 2011-03-31 09:01:27 +0000
+++ b/bzrlib/lockdir.py 2011-05-16 13:39:39 +0000
@@ -355,7 +355,7 @@
holder_info = self.peek()
except LockCorrupt, e:
# The lock info is corrupt.
- if bzrlib.ui.ui_factory.get_boolean("Break (corrupt %r)" % (self,)):
+ if bzrlib.ui.ui_factory.get_boolean(u"Break (corrupt %r)" % (self,)):
self.force_break_corrupt(e.file_data)
return
if holder_info is not None:
=== modified file 'bzrlib/msgeditor.py'
--- a/bzrlib/msgeditor.py 2011-05-24 09:52:04 +0000
+++ b/bzrlib/msgeditor.py 2011-05-27 05:16:48 +0000
@@ -151,7 +151,7 @@
edited_content = msg_transport.get_bytes(basename)
if edited_content == reference_content:
if not ui.ui_factory.confirm_action(
- "Commit message was not edited, use anyway",
+ u"Commit message was not edited, use anyway",
"bzrlib.msgeditor.unchanged",
{}):
# Returning "" makes cmd_commit raise 'empty commit message
=== modified file 'bzrlib/tests/per_uifactory/__init__.py'
--- a/bzrlib/tests/per_uifactory/__init__.py 2011-01-10 22:20:12 +0000
+++ b/bzrlib/tests/per_uifactory/__init__.py 2011-05-16 14:02:27 +0000
@@ -66,9 +66,8 @@
# confirm_action should be answered by every ui factory; even
# noninteractive ones should have a reasonable default
self._load_responses([True])
- result = self.factory.confirm_action(
- 'Break a lock?',
- 'bzr.lock.break.confirm',
+ result = self.factory.confirm_action(u'Break a lock?',
+ 'bzr.lock.break.confirm',
{})
# will be true either because we read it from the input or because
# that's the default
=== modified file 'bzrlib/tests/test_script.py'
--- a/bzrlib/tests/test_script.py 2011-05-13 12:51:05 +0000
+++ b/bzrlib/tests/test_script.py 2011-05-16 13:39:39 +0000
@@ -558,7 +558,7 @@
def run(self):
if ui.ui_factory.get_boolean(
- 'Really do it',
+ u'Really do it',
# 'bzrlib.tests.test_script.confirm',
# {}
):
=== modified file 'bzrlib/tests/test_ui.py'
--- a/bzrlib/tests/test_ui.py 2011-04-05 17:37:53 +0000
+++ b/bzrlib/tests/test_ui.py 2011-05-16 13:39:39 +0000
@@ -63,7 +63,7 @@
def test_text_factory_confirm(self):
# turns into reading a regular boolean
ui = self.make_test_ui_factory('n\n')
- self.assertEquals(ui.confirm_action('Should %(thing)s pass?',
+ self.assertEquals(ui.confirm_action(u'Should %(thing)s pass?',
'bzrlib.tests.test_ui.confirmation',
{'thing': 'this'},),
False)
@@ -119,12 +119,12 @@
stdout = tests.StringIOWrapper()
stderr = tests.StringIOWrapper()
factory = _mod_ui_text.TextUIFactory(stdin, stdout, stderr)
- self.assertEqual(True, factory.get_boolean(""))
- self.assertEqual(False, factory.get_boolean(""))
- self.assertEqual(True, factory.get_boolean(""))
- self.assertEqual(False, factory.get_boolean(""))
- self.assertEqual(True, factory.get_boolean(""))
- self.assertEqual(False, factory.get_boolean(""))
+ self.assertEqual(True, factory.get_boolean(u""))
+ self.assertEqual(False, factory.get_boolean(u""))
+ self.assertEqual(True, factory.get_boolean(u""))
+ self.assertEqual(False, factory.get_boolean(u""))
+ self.assertEqual(True, factory.get_boolean(u""))
+ self.assertEqual(False, factory.get_boolean(u""))
self.assertEqual("foo\n", factory.stdin.read())
# stdin should be empty
self.assertEqual('', factory.stdin.readline())
@@ -137,15 +137,15 @@
stdout = tests.StringIOWrapper()
stderr = tests.StringIOWrapper()
factory = _mod_ui_text.TextUIFactory(stdin, stdout, stderr)
- self.assertEqual(1, factory.get_integer(""))
- self.assertEqual(-2, factory.get_integer(""))
- self.assertEqual(42, factory.get_integer(""))
+ self.assertEqual(1, factory.get_integer(u""))
+ self.assertEqual(-2, factory.get_integer(u""))
+ self.assertEqual(42, factory.get_integer(u""))
def test_text_factory_prompt(self):
# see <https://launchpad.net/bugs/365891>
StringIO = tests.StringIOWrapper
factory = _mod_ui_text.TextUIFactory(StringIO(), StringIO(), StringIO())
- factory.prompt('foo %2e')
+ factory.prompt(u'foo %2e')
self.assertEqual('', factory.stdout.getvalue())
self.assertEqual('foo %2e', factory.stderr.getvalue())
@@ -166,7 +166,7 @@
self.apply_redirected(None, factory.stdout,
factory.stdout,
factory.get_boolean,
- "what do you want"))
+ u"what do you want"))
output = out.getvalue()
self.assertContainsRe(output,
"| foo *\r\r *\r*")
@@ -195,10 +195,10 @@
factory.stdout.encoding = "utf8"
# there is no output from the base factory
self.assertEqual("someuser",
- factory.get_username('Hello %(host)s', host='some'))
+ factory.get_username(u'Hello %(host)s', host='some'))
self.assertEquals("Hello some: ", factory.stderr.getvalue())
self.assertEquals('', factory.stdout.getvalue())
- self.assertEqual("", factory.get_username("Gebruiker"))
+ self.assertEqual("", factory.get_username(u"Gebruiker"))
# stdin should be empty
self.assertEqual('', factory.stdin.readline())
@@ -352,7 +352,7 @@
self.assertRaises(
NotImplementedError,
self.apply_redirected,
- None, stdout, stdout, factory.get_boolean, "foo")
+ None, stdout, stdout, factory.get_boolean, u"foo")
class TestUIFactoryTests(tests.TestCase):
@@ -371,12 +371,12 @@
def test_canned_input_get_input(self):
uif = _mod_ui.CannedInputUIFactory([True, 'mbp', 'password', 42])
- self.assertEqual(True, uif.get_boolean('Extra cheese?'))
- self.assertEqual('mbp', uif.get_username('Enter your user name'))
+ self.assertEqual(True, uif.get_boolean(u'Extra cheese?'))
+ self.assertEqual('mbp', uif.get_username(u'Enter your user name'))
self.assertEqual('password',
- uif.get_password('Password for %(host)s',
+ uif.get_password(u'Password for %(host)s',
host='example.com'))
- self.assertEqual(42, uif.get_integer('And all that jazz ?'))
+ self.assertEqual(42, uif.get_integer(u'And all that jazz ?'))
class TestBoolFromString(tests.TestCase):
=== modified file 'bzrlib/transport/ssh.py'
--- a/bzrlib/transport/ssh.py 2011-01-11 20:20:13 +0000
+++ b/bzrlib/transport/ssh.py 2011-05-16 13:39:39 +0000
@@ -573,7 +573,8 @@
return True
except paramiko.PasswordRequiredException:
password = ui.ui_factory.get_password(
- prompt='SSH %(filename)s password', filename=filename)
+ prompt=u'SSH %(filename)s password',
+ filename=filename.decode(osutils._fs_enc))
try:
key = pkey_class.from_private_key_file(filename, password)
paramiko_transport.auth_publickey(username, key)
=== modified file 'bzrlib/ui/__init__.py'
--- a/bzrlib/ui/__init__.py 2011-05-19 09:32:38 +0000
+++ b/bzrlib/ui/__init__.py 2011-05-27 05:16:48 +0000
@@ -204,10 +204,10 @@
"""
return self.get_boolean(prompt % prompt_kwargs)
- def get_password(self, prompt='', **kwargs):
+ def get_password(self, prompt=u'', **kwargs):
"""Prompt the user for a password.
- :param prompt: The prompt to present the user
+ :param prompt: The prompt to present the user (must be unicode)
:param kwargs: Arguments which will be expanded into the prompt.
This lets front ends display different things if
they so choose.
@@ -483,7 +483,7 @@
def get_integer(self, prompt):
return self.responses.pop(0)
- def get_password(self, prompt='', **kwargs):
+ def get_password(self, prompt=u'', **kwargs):
return self.responses.pop(0)
def get_username(self, prompt, **kwargs):
=== modified file 'bzrlib/ui/text.py'
--- a/bzrlib/ui/text.py 2011-04-07 10:36:24 +0000
+++ b/bzrlib/ui/text.py 2011-05-16 13:39:39 +0000
@@ -114,7 +114,7 @@
password = password[:-1]
return password
- def get_password(self, prompt='', **kwargs):
+ def get_password(self, prompt=u'', **kwargs):
"""Prompt the user for a password.
:param prompt: The prompt to present the user
@@ -198,6 +198,8 @@
:param kwargs: Dictionary of arguments to insert into the prompt,
to allow UIs to reformat the prompt.
"""
+ if type(prompt) != unicode:
+ raise ValueError("prompt %r not a unicode string" % prompt)
if kwargs:
# See <https://launchpad.net/bugs/365891>
prompt = prompt % kwargs
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt 2011-05-26 20:24:20 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt 2011-05-27 05:16:48 +0000
@@ -35,6 +35,10 @@
* Reports the original error when an InvalidHttpResponse exception is
encountered to facilitate debug. (Vincent Ladeuil, #788530)
+* ``UIFactory.prompt``, ``UIFactory.get_username``,
+ ``UIFactory.get_password`` and ``UIFactory.get_boolean`` now require a
+ unicode prompt to be passed in. (Jelmer Vernooij, #592083)
+
Documentation
*************
More information about the bazaar-commits
mailing list