diff options
Diffstat (limited to 'git_config.py')
-rw-r--r-- | git_config.py | 15 |
1 files changed, 3 insertions, 12 deletions
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): | |||
276 | return None | 276 | return None |
277 | try: | 277 | try: |
278 | Trace(': parsing %s', self.file) | 278 | Trace(': parsing %s', self.file) |
279 | fd = open(self._json) | 279 | with open(self._json) as fd: |
280 | try: | ||
281 | return json.load(fd) | 280 | return json.load(fd) |
282 | finally: | ||
283 | fd.close() | ||
284 | except (IOError, ValueError): | 281 | except (IOError, ValueError): |
285 | platform_utils.remove(self._json) | 282 | platform_utils.remove(self._json) |
286 | return None | 283 | return None |
287 | 284 | ||
288 | def _SaveJson(self, cache): | 285 | def _SaveJson(self, cache): |
289 | try: | 286 | try: |
290 | fd = open(self._json, 'w') | 287 | with open(self._json, 'w') as fd: |
291 | try: | ||
292 | json.dump(cache, fd, indent=2) | 288 | json.dump(cache, fd, indent=2) |
293 | finally: | ||
294 | fd.close() | ||
295 | except (IOError, TypeError): | 289 | except (IOError, TypeError): |
296 | if os.path.exists(self._json): | 290 | if os.path.exists(self._json): |
297 | platform_utils.remove(self._json) | 291 | platform_utils.remove(self._json) |
@@ -773,15 +767,12 @@ class Branch(object): | |||
773 | self._Set('merge', self.merge) | 767 | self._Set('merge', self.merge) |
774 | 768 | ||
775 | else: | 769 | else: |
776 | fd = open(self._config.file, 'a') | 770 | with open(self._config.file, 'a') as fd: |
777 | try: | ||
778 | fd.write('[branch "%s"]\n' % self.name) | 771 | fd.write('[branch "%s"]\n' % self.name) |
779 | if self.remote: | 772 | if self.remote: |
780 | fd.write('\tremote = %s\n' % self.remote.name) | 773 | fd.write('\tremote = %s\n' % self.remote.name) |
781 | if self.merge: | 774 | if self.merge: |
782 | fd.write('\tmerge = %s\n' % self.merge) | 775 | fd.write('\tmerge = %s\n' % self.merge) |
783 | finally: | ||
784 | fd.close() | ||
785 | 776 | ||
786 | def _Set(self, key, value): | 777 | def _Set(self, key, value): |
787 | key = 'branch.%s.%s' % (self.name, key) | 778 | key = 'branch.%s.%s' % (self.name, key) |