sagemath/sagemath-sagenb.patch

diff -up build/pkgs/sagenb/src/sagenb-0.11.1/sagenb/flask_version/base.py.orig build/pkgs/sagenb/src/sagenb-0.11.1/sagenb/flask_version/base.py
--- build/pkgs/sagenb/src/sagenb-0.11.1/sagenb/flask_version/base.py.orig	2014-12-06 17:45:36.063723826 -0200
+++ build/pkgs/sagenb/src/sagenb-0.11.1/sagenb/flask_version/base.py	2014-12-06 17:49:09.074731983 -0200
@@ -4,8 +4,6 @@ from functools import partial
 from flask import Flask, Module, url_for, render_template, request, session, redirect, g, make_response, current_app
 from decorators import login_required, guest_or_login_required, with_lock
 from decorators import global_lock
-# Make flask use the old session foo from <=flask-0.9
-from flask_oldsessions import OldSecureCookieSessionInterface
 
 from flask.ext.autoindex import AutoIndex
 try:
@@ -25,7 +23,6 @@ class SageNBFlask(Flask):
     def __init__(self, *args, **kwds):
         self.startup_token = kwds.pop('startup_token', None)
         Flask.__init__(self, *args, **kwds)
-        self.session_interface = OldSecureCookieSessionInterface()
 
         self.config['SESSION_COOKIE_HTTPONLY'] = False
 
@@ -36,12 +33,12 @@ class SageNBFlask(Flask):
         self.add_static_path('/javascript', DATA)
         self.add_static_path('/static', DATA)
         self.add_static_path('/java', DATA)
-        self.add_static_path('/java/jmol', os.path.join(os.environ["SAGE_ROOT"],"local","share","jmol"))
-        self.add_static_path('/jsmol', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol"))
-        self.add_static_path('/jsmol/js', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","js"))
-        self.add_static_path('/j2s', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","j2s"))
-        self.add_static_path('/jsmol/j2s', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","j2s"))
-        self.add_static_path('/j2s/core', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","j2s","core"))
+        self.add_static_path('/java/jmol', os.path.join(os.environ["SAGE_ROOT"],"share","jmol"))
+        self.add_static_path('/jsmol', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol"))
+        self.add_static_path('/jsmol/js', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol","js"))
+        self.add_static_path('/j2s', os.path.join(os.environ["SAGE_ROOT"],"jsmol","j2s"))
+        self.add_static_path('/jsmol/j2s', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol","j2s"))
+        self.add_static_path('/j2s/core', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol","j2s","core"))
         import mimetypes
         mimetypes.add_type('text/plain','.jmol')
 
diff -up build/pkgs/sagenb/src/sagenb-0.11.1/sagenb/misc/misc.py.orig build/pkgs/sagenb/src/sagenb-0.11.1/sagenb/misc/misc.py
--- build/pkgs/sagenb/src/sagenb-0.11.1/sagenb/misc/misc.py.orig	2014-12-06 17:45:36.066723826 -0200
+++ build/pkgs/sagenb/src/sagenb-0.11.1/sagenb/misc/misc.py	2014-12-06 17:45:38.853723933 -0200
@@ -174,7 +174,8 @@ def pad_zeros(s, size=3):
 
 SAGENB_ROOT = os.path.split(resource_filename(__name__, ''))[0]
 
-DATA = os.path.join(SAGENB_ROOT, 'data')
+from sage.misc.misc import SAGE_SRC
+DATA = os.path.join(SAGE_SRC, 'sagenb', 'data')
 
 if os.environ.has_key('DOT_SAGENB'):
     DOT_SAGENB = os.environ['DOT_SAGENB']
diff -up build/pkgs/sagenb/src/sagenb-0.11.1/sagenb/notebook/cell.py.orig build/pkgs/sagenb/src/sagenb-0.11.1/sagenb/notebook/cell.py
--- build/pkgs/sagenb/src/sagenb-0.11.1/sagenb/notebook/cell.py.orig	2014-12-06 17:45:36.067723826 -0200
+++ build/pkgs/sagenb/src/sagenb-0.11.1/sagenb/notebook/cell.py	2014-12-06 17:45:38.854723933 -0200
@@ -2338,8 +2338,8 @@ class Cell(Cell_generic):
             with open(jmol_name, 'r') as f:
                 jmol_script = f.read()
             jmol_script = jmol_script.replace(
-                'defaultdirectory "', 
-                'defaultdirectory "{0}/'.format(self.url_to_worksheet()))
+                'defaultdirectory "',
+                'defaultdirectory "/home/' + self.worksheet_filename() + '/')
             with open(jmol_name, 'w') as f:
                 f.write(jmol_script)
  
diff -up build/pkgs/sagenb/src/sagenb-0.11.1/sagenb/notebook/run_notebook.py.orig build/pkgs/sagenb/src/sagenb-0.11.1/sagenb/notebook/run_notebook.py
--- build/pkgs/sagenb/src/sagenb-0.11.1/sagenb/notebook/run_notebook.py.orig	2014-12-06 17:45:36.069723826 -0200
+++ build/pkgs/sagenb/src/sagenb-0.11.1/sagenb/notebook/run_notebook.py	2014-12-06 17:45:38.854723933 -0200
@@ -46,12 +46,14 @@ sagenb.notebook.misc.DIR = %(cwd)r #We s
 # Flask #
 #########
 import os, sys, random
-import sagenb.flask_version.base as flask_base
+sagenb_dir = os.path.join(os.environ['SAGE_ROOT'], 'src', 'sagenb')
+sys.path.append(sagenb_dir)
+import flask_version.base as flask_base
 opts={}
 startup_token = '{0:x}'.format(random.randint(0, 2**128))
 if %(automatic_login)s:
     opts['startup_token'] = startup_token
-flask_app = flask_base.create_app(%(notebook_opts)s, **opts)
+flask_app = flask_base.create_app(%(notebook_opts)s, startup_token=startup_token)
 
 def save_notebook(notebook):
     print "Quitting all running worksheets..."