diff -r ab452995eaff -r 8d858fbf2759 mercurial/pycompat.py --- a/mercurial/pycompat.py Tue Sep 04 20:48:22 2018 -0400 +++ b/mercurial/pycompat.py Tue Sep 04 22:29:38 2018 -0400 @@ -120,6 +120,8 @@ rawinput = input getargspec = inspect.getfullargspec + long = int + # TODO: .buffer might not exist if std streams were replaced; we'll need # a silly wrapper to make a bytes stream backed by a unicode one. stdin = sys.stdin.buffer @@ -384,6 +386,7 @@ ospardir = os.pardir ossep = os.sep osaltsep = os.altsep + long = long stdin = sys.stdin stdout = sys.stdout stderr = sys.stderr