From bf0df5afba27437216180ff3da0c864fd443588d Mon Sep 17 00:00:00 2001 From: Miguel BarĂ£o Date: Wed, 2 Jan 2019 22:36:19 +0000 Subject: [PATCH] - remove a with statement from FileHandler --- factory.py | 4 ++++ knowledge.py | 4 +++- serve.py | 13 ++++++------- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/factory.py b/factory.py index 06d3998..5f7d889 100644 --- a/factory.py +++ b/factory.py @@ -74,6 +74,10 @@ class QFactory(object): # Given a ref returns an instance of a descendent of Question(), # i.e. a question object (radio, checkbox, ...). # ----------------------------------------------------------------------- + # async def generate_async(self): + # loop = asyncio.get_event_loop() + # return await loop.run_in_executor(None, self.generate) + def generate(self): logger.debug(f'Generating "{self.question["ref"]}"...') # Shallow copy so that script generated questions will not replace diff --git a/knowledge.py b/knowledge.py index 0e31804..63b3e50 100644 --- a/knowledge.py +++ b/knowledge.py @@ -94,7 +94,9 @@ class StudentKnowledge(object): logger.debug(f'Questions: {", ".join(questions)}') # generate instances of questions - self.questions = [self.factory[qref].generate() for qref in questions] + gen = lambda qref: self.factory[qref].generate() + self.questions = [gen(qref) for qref in questions] + # self.questions = [gen(qref) for qref in questions] logger.debug(f'Total: {len(self.questions)} questions') # get first question diff --git a/serve.py b/serve.py index 959b6bf..c771707 100755 --- a/serve.py +++ b/serve.py @@ -193,13 +193,12 @@ class FileHandler(BaseHandler): except Exception as e: raise e else: - with f: - data = f.read() - f.close() - self.set_header("Content-Type", content_type) - self.write(data) - await self.flush() - # self.flush() + data = f.read() + f.close() + self.set_header("Content-Type", content_type) + self.write(data) + await self.flush() + # self.flush() # ---------------------------------------------------------------------------- -- libgit2 0.21.2