Ticket #4975: trac_4975.patch

sage-preparse

@@ -17 +17 @@
 files = sys.argv[2:]
 
 # There must be at least 1 file or we display an error/usage message
-# and exit. 
+# and exit
 if len(files) == 0:
     print "Usage: %s <file1.sage> <file2.sage>..."%sys.argv[0]
     print "Creates files file1.py, file2.py ... that are the Sage"
@@ -78 +78 @@
     #if os.path.exists(fname) and os.path.getmtime(fname) >= os.path.getmtime(f):
     #    return
 
-    # Finally open the file and preparse it.
+    # Finally open the file
     F = open(f).read()
+
+    #Check to see if a coding is specified in the .sage file.
+    #If it is, then we want to copy it over to the new file
+    #and not include it in the preprocessing
+    if F.startswith('# -*- coding:'):
+        end = F.find('\n')
+        coding = F[:end+1] if end != -1 else F
+        F = F[len(coding):]
+    else:
+        coding = ''
+
+    #Preparse it
     from sage.misc.preparser  import preparse_file
     G = preparse_file(F, magic=False, do_time=True, ignore_prompts=False)
 
     # Check for load/attach commands.
     G = do_load_and_attach(G, f, files_before)
 
+
     # Put the Sage library include along with a autogen message in the file.
     # It is ** critical ** that we put this after the mdoule docstring, since
     # otherwise the module docstring will disappear. 
-    insert = '%s%s.\nfrom sage.all_cmdline import *   # import sage library\n'%(AUTOGEN_MSG, f)
+    insert = '%s%s%s.\nfrom sage.all_cmdline import *   # import sage library\n'%(coding, AUTOGEN_MSG, f)
     i = find_position_right_after_module_docstring(G)
     G = G[:i] + insert + G[i:]