Ticket #7514: sagenb-7514-rebase-part3.patch

sagenb/notebook/cell.py

@@ -2082 +2082 @@
             return ''
         images = []
         files  = []
+
+        from worksheet import CODE_PY
         # The question mark trick here is so that images will be reloaded when
         # the async request requests the output text for a computation.
         # This is inspired by http://www.irt.org/script/416.htm/.
         for F in D:
-            if 'cell://%s'%F in out:
+            if os.path.split(F)[-1] == CODE_PY or 'cell://%s'%F in out:
                 continue
             url = os.path.join(self.url_to_self(), F)
             if F.endswith('.png') or F.endswith('.bmp') or \

sagenb/notebook/worksheet.py

@@ -3639 +3639 @@
         return support.get_rightmost_identifier(s)
 
     def preparse(self, s):
-        return 'open("%s","w").write(_support_.preparse_worksheet_cell(base64.b64decode("%s"),globals())); execfile(os.path.abspath("%s"))'%(CODE_PY, base64.b64encode(s), CODE_PY)
+        """
+        Return preparsed version of input code s, ready to be sent to
+        the Sage process for evaluation.   The output is a "safe string"
+        (no funny characters).
+
+        INPUT:
+
+            - `s` -- a string
+
+        OUTPUT:
+
+            - a string
+        """
+        # The extra newline below is necessary, since otherwise source
+        # code introspection doesn't include the last line.
+        return 'open("%s","w").write(_support_.preparse_worksheet_cell(base64.b64decode("%s"),globals())+"\\n"); execfile(os.path.abspath("%s"))'%(CODE_PY, base64.b64encode(s), CODE_PY)
 
     ##########################################################
     # Loading and attaching files