# HG changeset patch # User Matt Harbison # Date 1544855178 18000 # Node ID e11e03f72baf832f4994447ee2120ac67bd0fb08 # Parent 21f5810df84864ec01ca69ec1f36ddb54b6749fe py3: ensure the proxied Windows fd doesn't escape by entering context manager The purpose of the proxy class is to provide the `name` attribute which contains the file path. But in tests that used a context manager, it still blew up complaining that 'int' doesn't have a 'startswith' function. diff -r 21f5810df848 -r e11e03f72baf mercurial/windows.py --- a/mercurial/windows.py Wed Dec 12 06:41:19 2018 +0100 +++ b/mercurial/windows.py Sat Dec 15 01:26:18 2018 -0500 @@ -132,7 +132,10 @@ self._fp = fp def __enter__(self): - return self._fp.__enter__() + self._fp.__enter__() + # Return this wrapper for the context manager so that the name is + # still available. + return self def __exit__(self, exc_type, exc_value, traceback): self._fp.__exit__(exc_type, exc_value, traceback)