changeset 48959 | 9ac1a4507bb3 |
parent 48946 | 642e31cb55f0 |
child 48960 | c3a48dd506da |
--- a/mercurial/pycompat.py Tue Mar 08 19:09:35 2022 -0800 +++ b/mercurial/pycompat.py Tue Mar 08 19:10:19 2022 -0800 @@ -86,7 +86,7 @@ return _rapply(f, xs) -if os.name == r'nt' and sys.version_info >= (3, 6): +if os.name == r'nt': # MBCS (or ANSI) filesystem encoding must be used as before. # Otherwise non-ASCII filenames in existing repositories would be # corrupted. @@ -415,7 +415,6 @@ return json.loads(s, *args, **kwargs) - else: json_loads = json.loads