Changeset cc7d19412b43…
Parent ba332c3533d5…
by
Changes to one file · Browse files at cc7d19412b43 Showing diff from parent ba332c3533d5 Diff from another changeset...
@@ -56,11 +56,14 @@ """
try:
return s.decode('utf-8').encode(_encoding)
- except UnicodeDecodeError:
+ except (UnicodeDecodeError, UnicodeEncodeError):
pass
- except UnicodeEncodeError:
+ try:
+ return s.decode('utf-8').encode(_fallbackencoding)
+ except (UnicodeDecodeError, UnicodeEncodeError):
pass
- return s.decode('utf-8').encode(_fallbackencoding)
+ u = s.decode('utf-8', 'replace') # last ditch
+ return u.encode(_encoding, 'replace')
_tabwidth = None
def gettabwidth(ui):
|
Loading...