From 3164d40e2247d42537aef8e80fa7e048e14bec9f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 11 Nov 2019 05:40:22 -0500 Subject: use open context managers in more places Use open() as a context manager to simplify the close logic and make the code easier to read & understand. This is also more Pythonic. Change-Id: I579d03cca86f99b2c6c6a1f557f6e5704e2515a7 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/244734 Reviewed-by: David Pursehouse Tested-by: Mike Frysinger --- git_config.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'git_config.py') diff --git a/git_config.py b/git_config.py index 1ea9c43e..680de90f 100644 --- a/git_config.py +++ b/git_config.py @@ -276,22 +276,16 @@ class GitConfig(object): return None try: Trace(': parsing %s', self.file) - fd = open(self._json) - try: + with open(self._json) as fd: return json.load(fd) - finally: - fd.close() except (IOError, ValueError): platform_utils.remove(self._json) return None def _SaveJson(self, cache): try: - fd = open(self._json, 'w') - try: + with open(self._json, 'w') as fd: json.dump(cache, fd, indent=2) - finally: - fd.close() except (IOError, TypeError): if os.path.exists(self._json): platform_utils.remove(self._json) @@ -773,15 +767,12 @@ class Branch(object): self._Set('merge', self.merge) else: - fd = open(self._config.file, 'a') - try: + with open(self._config.file, 'a') as fd: fd.write('[branch "%s"]\n' % self.name) if self.remote: fd.write('\tremote = %s\n' % self.remote.name) if self.merge: fd.write('\tmerge = %s\n' % self.merge) - finally: - fd.close() def _Set(self, key, value): key = 'branch.%s.%s' % (self.name, key) -- cgit v1.2.3-54-g00ecf