- remove a with statement from FileHandler

Miguel Barão
1 parent 563f62ce
Showing 3 changed files with 13 additions and 8 deletions Show diff stats
factory.py
knowledge.py
serve.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
@@ -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
@@ -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()
 # ----------------------------------------------------------------------------