diff -r 52dabcc49968 -r 3b7a6941a6ef mercurial/util.py --- a/mercurial/util.py Wed Mar 15 23:21:30 2017 +0900 +++ b/mercurial/util.py Wed Mar 15 23:28:39 2017 +0900 @@ -17,6 +17,7 @@ import bz2 import calendar +import codecs import collections import datetime import errno @@ -2131,7 +2132,9 @@ ) def escapestr(s): - return s.encode('string_escape') + # call underlying function of s.encode('string_escape') directly for + # Python 3 compatibility + return codecs.escape_encode(s)[0] def uirepr(s): # Avoid double backslash in Windows path repr()