From b5eda37c757c329d24de26c2ce7b9d394732f8c4 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 27 May 2019 13:12:09 -0400 Subject: [PATCH] use contextmanagers for open() --- src/calibre/ebooks/conversion/plugins/mobi_input.py | 3 ++- src/calibre/ebooks/conversion/plugins/recipe_input.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/calibre/ebooks/conversion/plugins/mobi_input.py b/src/calibre/ebooks/conversion/plugins/mobi_input.py index 8c42e8345d..e9a89b5860 100644 --- a/src/calibre/ebooks/conversion/plugins/mobi_input.py +++ b/src/calibre/ebooks/conversion/plugins/mobi_input.py @@ -52,7 +52,8 @@ class MOBIInput(InputFormatPlugin): if raw: if isinstance(raw, unicode_type): raw = raw.encode('utf-8') - open(u'debug-raw.html', 'wb').write(raw) + with open(u'debug-raw.html', 'wb') as f: + f.write(raw) from calibre.ebooks.oeb.base import close_self_closing_tags for f, root in parse_cache.items(): raw = html.tostring(root, encoding='utf-8', method='xml', diff --git a/src/calibre/ebooks/conversion/plugins/recipe_input.py b/src/calibre/ebooks/conversion/plugins/recipe_input.py index 26577a5e60..2670859e21 100644 --- a/src/calibre/ebooks/conversion/plugins/recipe_input.py +++ b/src/calibre/ebooks/conversion/plugins/recipe_input.py @@ -65,7 +65,8 @@ class RecipeInput(InputFormatPlugin): zf = ZipFile(recipe_or_file, 'r') zf.extractall() zf.close() - self.recipe_source = open(u'download.recipe', 'rb').read() + with open('download.recipe', 'rb') as f: + self.recipe_source = f.read() recipe = compile_recipe(self.recipe_source) recipe.needs_subscription = False self.recipe_object = recipe(opts, log, self.report_progress) @@ -87,7 +88,8 @@ class RecipeInput(InputFormatPlugin): self.recipe_source = self.recipe_source.encode('utf-8') recipe = compile_recipe(self.recipe_source) elif os.access(recipe_or_file, os.R_OK): - self.recipe_source = open(recipe_or_file, 'rb').read() + with open(recipe_or_file, 'rb') as f: + self.recipe_source = f.read() recipe = compile_recipe(self.recipe_source) log('Using custom recipe') else: