Ticket #652: ncalexan-652-updated.patch

sage/misc/interpreter.py

@@ -185 +185 @@
                     if F.endswith('.py'):
                         _ip.magic('run -i "%s"'%F)
                     elif F.endswith('.sage'):
-                        _ip.magic('run -i "%s"'%process_file(F))
+                        _ip.magic('run -i "%s"'%preparse_file_named(F))
                     elif F.endswith('.spyx') or F.endswith('.pyx'):
                         X = load_cython(F)
                         __IPYTHON__.push(X)
@@ -276 +276 @@
                     raise ImportError, "Error loading '%s'"%name
             elif name.endswith('.sage'):
                 try:
-                    line = '%run -i "' + process_file(name) + '"'
+                    line = '%run -i "' + preparse_file_named(name) + '"'
                 except IOError, s:
                     print s
                     raise ImportError, "Error loading '%s'"%name
@@ -330 +330 @@
                 raise ImportError, "File '%s' not found."%name
         elif name.endswith('.sage'):
             try:
-                line = '%run -i "' + process_file(name) + '"'
+                line = '%run -i "' + preparse_file_named(name) + '"'
                 attached[name] = os.path.getmtime(name)
             except IOError, OSError:
                 raise ImportError, "File '%s' not found."%name
@@ -359 +359 @@
     import sys
     sys.path.append(dir)
     return 'from %s import *'%mod
-
-def process_file(name):
+    
+def preparse_file_named_to_stream(name, out):
+    r"""
+    Preparse file named \code{name} (presumably a .sage file), outputting to
+    stream \code{out}.
+    """
+    name = os.path.abspath(name)
+    dir, _ = os.path.split(name)
     cur = os.path.abspath(os.curdir)
-    dir, name = os.path.split(os.path.abspath(name))
-    name2 = "%s/%s.py"%(dir,name[:name.find('.')])
     os.chdir(dir)
     contents = open(name).read()
     parsed = preparse_file(contents, attached, do_time=True) 
     os.chdir(cur)
-    W = open(name2,'w')
-    W.write('#'*70+'\n')
-    W.write('# This file was *autogenerated* from the file %s.\n'%name)
-    W.write('#'*70+'\n')
-    W.write(parsed)
-    W.close()
-    return name2
-    
+    out.write('#'*70+'\n')
+    out.write('# This file was *autogenerated* from the file %s.\n' % name)
+    out.write('#'*70+'\n')
+    out.write(parsed)
+
+def preparse_file_named(name):
+    r"""
+    Preparse file named \code{name} (presumably a .sage file), outputting to a
+    temporary file.  Returns name of temporary file.
+    """
+    import sage.misc.misc
+    name = os.path.abspath(name)
+    tmpfilename = os.path.abspath(sage.misc.misc.tmp_filename(name) + ".py")
+    out = open(tmpfilename,'w')
+    preparse_file_named_to_stream(name, out)
+    out.close()
+    return tmpfilename
 
 def sage_prefilter(self, block, continuation):
     """

sage/misc/misc.py

@@ -1366 +1366 @@
 __tmp_n = 0
 
 def tmp_filename(name='tmp'):
-    name = str(name)
+    name = list(str(name))
+    for i in range(len(name)):
+        # protect against paths with slashes, colons, etc
+        if not (name[i].isalpha() or name[i].isdigit()):
+            name[i] = '_'
+    name = ''.join(name)
+
     global __tmp_n
     while True:
         tmp = "%s/%s_%s"%(SAGE_TMP, name, __tmp_n)