diff options
Diffstat (limited to 'debian/patches/fix-unicodeencode-error')
| -rw-r--r-- | debian/patches/fix-unicodeencode-error | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/debian/patches/fix-unicodeencode-error b/debian/patches/fix-unicodeencode-error deleted file mode 100644 index 821ceb9..0000000 --- a/debian/patches/fix-unicodeencode-error +++ /dev/null @@ -1,19 +0,0 @@ -Description: fix for _format arg function raising UnicodeDecodeError if DEFAULT_ENCODING cannot encode unicode characters -Author: Ben Carrillo <ben@futeisha.org> -Bug: XXX -Forwarded: yes ---- a/sh.py -+++ b/sh.py -@@ -561,7 +561,11 @@ - # if the argument is already unicode, or a number or whatever, - # this first call will fail. - try: arg = unicode(arg, DEFAULT_ENCODING).encode(DEFAULT_ENCODING) -- except TypeError: arg = unicode(arg).encode(DEFAULT_ENCODING) -+ except TypeError: -+ try: -+ arg = unicode(arg).encode(DEFAULT_ENCODING) -+ except UnicodeEncodeError: -+ arg = unicode(arg).encode('utf-8') - return arg - - |