D6784: httppeer: use context manager when reading temporary bundle to send
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Sep 5 04:36:41 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6784
AFFECTED FILES
mercurial/httppeer.py
CHANGE DETAILS
diff --git a/mercurial/httppeer.py b/mercurial/httppeer.py
--- a/mercurial/httppeer.py
+++ b/mercurial/httppeer.py
@@ -490,7 +490,6 @@
os.unlink(tempname)
def _calltwowaystream(self, cmd, fp, **args):
- fp_ = None
filename = None
try:
# dump bundle to disk
@@ -501,12 +500,10 @@
fh.write(d)
d = fp.read(4096)
# start http push
- fp_ = httpconnection.httpsendfile(self.ui, filename, "rb")
- headers = {r'Content-Type': r'application/mercurial-0.1'}
- return self._callstream(cmd, data=fp_, headers=headers, **args)
+ with httpconnection.httpsendfile(self.ui, filename, "rb") as fp_:
+ headers = {r'Content-Type': r'application/mercurial-0.1'}
+ return self._callstream(cmd, data=fp_, headers=headers, **args)
finally:
- if fp_ is not None:
- fp_.close()
if filename is not None:
os.unlink(filename)
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list