##// END OF EJS Templates
py3: use util.forcebytestr instead of str to convert error messages...
Pulkit Goyal -
r36718:f659a407 default
parent child Browse files
Show More
@@ -269,7 +269,7 b' def share(ui, source, dest=None, update='
269 # ValueError is raised on Windows if the drive letters differ on
269 # ValueError is raised on Windows if the drive letters differ on
270 # each path
270 # each path
271 raise error.Abort(_('cannot calculate relative path'),
271 raise error.Abort(_('cannot calculate relative path'),
272 hint=str(e))
272 hint=util.forcebytestr(e))
273 else:
273 else:
274 requirements += 'shared\n'
274 requirements += 'shared\n'
275
275
@@ -235,7 +235,7 b' def strip(ui, repo, nodelist, backup=Tru'
235 except OSError as e:
235 except OSError as e:
236 if e.errno != errno.ENOENT:
236 if e.errno != errno.ENOENT:
237 ui.warn(_('error removing %s: %s\n') %
237 ui.warn(_('error removing %s: %s\n') %
238 (undovfs.join(undofile), str(e)))
238 (undovfs.join(undofile), util.forcebytestr(e)))
239
239
240 except: # re-raises
240 except: # re-raises
241 if backupfile:
241 if backupfile:
@@ -1996,7 +1996,8 b' class revlog(object):'
1996 try:
1996 try:
1997 return _zlibdecompress(data)
1997 return _zlibdecompress(data)
1998 except zlib.error as e:
1998 except zlib.error as e:
1999 raise RevlogError(_('revlog decompress error: %s') % str(e))
1999 raise RevlogError(_('revlog decompress error: %s') %
2000 util.forcebytestr(e))
2000 # '\0' is more common than 'u' so it goes first.
2001 # '\0' is more common than 'u' so it goes first.
2001 elif t == '\0':
2002 elif t == '\0':
2002 return data
2003 return data
General Comments 0
You need to be logged in to leave comments. Login now