Merge lp:~vila/bzr/1086209-lc-all-c into lp:bzr
Proposed by
Vincent Ladeuil
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Vincent Ladeuil | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 6572 | ||||
Proposed branch: | lp:~vila/bzr/1086209-lc-all-c | ||||
Merge into: | lp:bzr | ||||
Diff against target: |
47 lines (+10/-5) 3 files modified
bzrlib/tests/test_ui.py (+0/-1) bzrlib/ui/text.py (+7/-1) doc/en/release-notes/bzr-2.6.txt (+3/-3) |
||||
To merge this branch: | bzr merge lp:~vila/bzr/1086209-lc-all-c | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John A Meinel | Approve | ||
Review via email: mp+137862@code.launchpad.net |
Commit message
Fix LC_ALL=C test failures related to utf8 stderr encoding
Description of the change
This should fix the LC_ALL=C test failures.
It's a bit weird that we didn't try to use the self.stderr encoding so I
went with a conservative fix: if something bad happens, we'll fall back to
the previous implementation.
To post a comment you must log in.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 2012-12-04 18:29, Vincent Ladeuil wrote: /bugs.launchpad .net/bzr/ +bug/1086209 /code.launchpad .net/~vila/ bzr/1086209- lc-all- c/+merge/ 137862
> Vincent Ladeuil has proposed merging lp:~vila/bzr/1086209-lc-all-c
> into lp:bzr.
>
> Requested reviews: bzr-core (bzr-core) Related bugs: Bug #1086209
> in Bazaar: "test failures in bzr.dev when run with LC_ALL=C"
> https:/
>
> For more details, see:
> https:/
>
> This should fix the LC_ALL=C test failures.
>
> It's a bit weird that we didn't try to use the self.stderr encoding
> so I went with a conservative fix: if something bad happens, we'll
> fall back to the previous implementation.
>
+* Fix test failures occurring only with LC_ALL=C, when prompting a user,
+ ``stdee`` encoding should be preferred over terminal encoding if
+ available. (Vincent Ladeuil, #1086209)
tyop
Otherwise:
review: approve
John
=:->
-----BEGIN PGP SIGNATURE----- www.enigmail. net/
+HCMACgkQJdeBCY SNAAP4dACfd6iuM u3YbSn+ ICQMQKKZqs2L 0Z0r4W1dAVkHwOD x+
Version: GnuPG v1.4.12 (Cygwin)
Comment: Using GnuPG with undefined - http://
iEYEARECAAYFAlC
JZUAn0iYiaxAE1q
=lqmC
-----END PGP SIGNATURE-----