Changeset 8057:20cd22d1b4f7

Timestamp:

01/15/08 14:27:59 (5 years ago)

Author:

Robert Bradshaw <robertwb@…>

Branch:

default

Message:

Improve use of cython in notebook

• automatically import sage.all (when Cython upgraded)
• html code annotation
• shorten long filenames in output

Location:

sage

Files:

• misc/cython.py (modified) (3 diffs)
• server/notebook/cell.py (modified) (1 diff)

sage/misc/cython.py

@@ -133 +133 @@
 
 def cython(filename, verbose=False, compile_message=False,
-          use_cache=False, create_local_c_file=False):
+          use_cache=False, create_local_c_file=False, annotate=True, sage_namespace=True):
     if not filename.endswith('pyx'):
         print "File (=%s) should have extension .pyx"%filename
@@ -218 +218 @@
 
     cython_include = ' '.join(["-I '%s'"%x for x in includes if len(x.strip()) > 0 ])
-
-    cmd = "cd '%s' && cython -p --incref-local-binop %s '%s.pyx' 1>log 2>err " % (build_dir, cython_include, name)
+    
+    options = ['-p', '--incref-local-binop']
+    if annotate:
+        options.append('-a')
+    if sage_namespace:
+        options.append('--pre-import sage.all')
+
+    cmd = "cd '%s' && cython %s %s '%s.pyx' 1>log 2>err " % (build_dir, ' '.join(options), cython_include, name)
 
     if create_local_c_file:
@@ -226 +232 @@
             target_c = target_c + "pp"
         cmd += " && cp '%s.c' '%s'"%(name, target_c)
+        if annotate:
+            target_html = '%s/_%s.pyx.html'%(os.path.abspath(os.curdir), base)
+            cmd += " && cp '%s.pyx.html' '%s'"%(name, target_html)
         
     if verbose:

sage/server/notebook/cell.py

@@ -614 +614 @@
                 pass # jmol data
             else:
-                files.append('<a href="%s" class="file_link">%s</a>'%(url, F))
+                link_text = str(F)
+                if len(link_text) > 40:
+                    link_text = link_text[:10] + '...' + link_text[-20:]
+                files.append('<a href="%s" class="file_link">%s</a>'%(url, link_text))
         if len(images) == 0:
             images = ''