Changeset 7480:bfdc4a04b179

Timestamp:

12/01/07 10:01:39 (5 years ago)

Author:

William Stein <wstein@…>

Branch:

default

Message:

trac #1349 -- change default location of sage_notebook; *ALSO* make a command inotebook(...) that runs an insecure version of the notebook just like 'sage -inotebook".

Location:

sage/server/notebook

Files:

• all.py (modified) (1 diff)
• notebook.py (modified) (1 diff)
• notebook_object.py (modified) (2 diffs)
• run_notebook.py (modified) (3 diffs)

sage/server/notebook/all.py

@@ -11 +11 @@
 #from twist import notebook_twisted as notebook
 
-from notebook_object import notebook
-
+from notebook_object import notebook, inotebook
 
 from sagetex import sagetex

sage/server/notebook/notebook.py

@@ -44 +44 @@
 class Notebook(SageObject):
     def __init__(self,
-                 dir='sage_notebook',
+                 dir,
                  system=None, 
                  show_debug = False,

sage/server/notebook/notebook_object.py

@@ -22 +22 @@
 
     INPUT:
-        directory  -- (default: 'sage_notebook') directory that contains
-                      the SAGE notebook files
+        directory  -- directory that contains the SAGE notebook files;
+                      The default is .sage/sage_notebook, in your home directory.
         port       -- (default: 8000), port to serve the notebook on
         address    -- (default: 'localhost'), address to listen on
@@ -141 +141 @@
 
 notebook = NotebookObject()
+
+
+def inotebook(*args, **kwds):
+    """
+    Exactly the same as notebook(...) but with secure=False.
+    """
+    kwds['secure'] = False
+    notebook(*args, **kwds)

sage/server/notebook/run_notebook.py

@@ -43 +43 @@
 
 def notebook_twisted(self,
-             directory   = 'sage_notebook',
+             directory   = None,
              port        = 8000,
              address     = 'localhost',
@@ -60 +60 @@
              sagetex_path = "",
              start_path = ""):
+    if directory is None:
+        directory = '%s/sage_notebook'%DOT_SAGE
     if not os.path.exists(directory):
         os.makedirs(directory)
+
+    print "The notebook files are stored in:", directory
+    # First change to the directory that contains the notebook directory
+    wd = os.path.split(directory)
+    if wd[0]: os.chdir(wd[0])
+    directory = wd[1]
+
+
     port = int(port)
     conf = '%s/twistedconf.tac'%directory
@@ -135 +145 @@
         
         config = open(conf, 'w')
+
         config.write("""
 ####################################################################        
 # WARNING -- Do not edit this file!   It is autogenerated each time
 # the notebook(...) command is executed.
-####################################################################        
+####################################################################
+
+# Now set things up and start the notebook
 import sage.server.notebook.notebook
 sage.server.notebook.notebook.JSMATH=True