| 1 |
commit: f292c3519082ad0932ad3a83a19e547c53b80824 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 2 01:40:02 2016 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 2 01:40:08 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f292c351 |
| 7 |
|
| 8 |
UserQuery: fix UnicodeDecodeError exception handler |
| 9 |
|
| 10 |
I messed up while making a last moment fix to the previous commit. |
| 11 |
|
| 12 |
Fixes: 1929e2bdab68 ("UserQuery: handle unicode (bug 573386)") |
| 13 |
|
| 14 |
pym/_emerge/UserQuery.py | 4 ++-- |
| 15 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/_emerge/UserQuery.py b/pym/_emerge/UserQuery.py |
| 18 |
index 8096d1b..e20bbc6 100644 |
| 19 |
--- a/pym/_emerge/UserQuery.py |
| 20 |
+++ b/pym/_emerge/UserQuery.py |
| 21 |
@@ -59,8 +59,8 @@ class UserQuery(object): |
| 22 |
response = input("[%s] " % |
| 23 |
"/".join([colours[i](responses[i]) |
| 24 |
for i in range(len(responses))])) |
| 25 |
- except UnicodeDecodeError: |
| 26 |
- response = _unicode_decode(response.object).rstrip('\n') |
| 27 |
+ except UnicodeDecodeError as e: |
| 28 |
+ response = _unicode_decode(e.object).rstrip('\n') |
| 29 |
else: |
| 30 |
response=raw_input("["+"/".join([colours[i](responses[i]) |
| 31 |
for i in range(len(responses))])+"] ") |
Archives