From d3241eb7ce13320d9dc1f274188e562ca143f273 Mon Sep 17 00:00:00 2001 From: Jason Grout Date: Tue, 26 May 2015 19:53:45 -0400 Subject: [PATCH] Delete redundant user_variables and user_expressions fields MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the user_variables and user_expressions fields are already part of the execute_reply content, just leave them there and don’t duplicate the data. --- handlers.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/handlers.py b/handlers.py index 1301ec8cf2..64bca21b9a 100644 --- a/handlers.py +++ b/handlers.py @@ -400,8 +400,6 @@ def post(self): def done(msg): if msg["msg_type"] == "execute_reply": self.success = msg["content"]["status"] == "ok" - self.user_variables = msg["content"].get("user_variables", []) - self.user_expressions = msg["content"].get("user_expressions", {}) self.execute_reply = msg['content'] loop.remove_timeout(self.timeout_request) loop.add_callback(self.finish_request) @@ -436,10 +434,6 @@ def finish_request(self): self.iopub_handler.on_close() # if the timeout is calling the finish_request, the success and other attributes may not be set retval.update(success=getattr(self, 'success', 'abort')) - if hasattr(self, 'user_variables'): - retval.update(user_variables=self.user_variables) - if hasattr(self, 'user_expressions'): - retval.update(user_expressions=self.user_expressions) if hasattr(self, 'execute_reply'): retval.update(execute_reply=self.execute_reply) self.set_header("Access-Control-Allow-Origin", self.request.headers.get("Origin", "*"))