diff -up build/pkgs/sagenb/src/sagenb/flask_version/base.py.orig build/pkgs/sagenb/src/sagenb/flask_version/base.py --- build/pkgs/sagenb/src/sagenb/flask_version/base.py.orig 2018-11-05 08:45:39.000000000 -0700 +++ build/pkgs/sagenb/src/sagenb/flask_version/base.py 2019-01-04 10:28:38.099158223 -0700 @@ -7,8 +7,6 @@ from functools import partial from flask import Flask, Blueprint, url_for, request, session, redirect, g, make_response, current_app, render_template 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_autoindex import AutoIndex from sage.env import SAGE_SRC, SAGE_DOC @@ -28,7 +26,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 @@ -39,13 +36,13 @@ 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_SHARE"],"jmol")) - self.add_static_path('/jsmol', os.path.join(os.environ["SAGE_SHARE"],"jsmol")) - self.add_static_path('/jsmol/js', os.path.join(os.environ["SAGE_SHARE"],"jsmol","js")) - self.add_static_path('/j2s', os.path.join(os.environ["SAGE_SHARE"],"jsmol","j2s")) - self.add_static_path('/jsmol/j2s', os.path.join(os.environ["SAGE_SHARE"],"jsmol","j2s")) - self.add_static_path('/j2s/core', os.path.join(os.environ["SAGE_SHARE"],"jsmol","j2s","core")) - self.add_static_path('/threejs', os.path.join(os.environ["SAGE_SHARE"],"threejs")) + 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")) + self.add_static_path('/threejs', os.path.join(os.environ["SAGE_ROOT"],"share","threejs")) import mimetypes mimetypes.add_type('text/plain','.jmol') diff -up build/pkgs/sagenb/src/sagenb/misc/misc.py.orig build/pkgs/sagenb/src/sagenb/misc/misc.py --- build/pkgs/sagenb/src/sagenb/misc/misc.py.orig 2018-11-05 08:45:39.000000000 -0700 +++ build/pkgs/sagenb/src/sagenb/misc/misc.py 2019-01-04 10:28:38.099158223 -0700 @@ -196,7 +196,8 @@ def pad_zeros(s, size=3): SAGENB_ROOT = os.path.split(resource_filename(__name__, ''))[0] -DATA = os.path.join(SAGENB_ROOT, 'data') +import sage.env +DATA = os.path.join(sage.env.SAGE_SRC, 'sagenb', 'data') if 'DOT_SAGENB' in os.environ: DOT_SAGENB = os.environ['DOT_SAGENB'] diff -up build/pkgs/sagenb/src/sagenb/notebook/cell.py.orig build/pkgs/sagenb/src/sagenb/notebook/cell.py --- build/pkgs/sagenb/src/sagenb/notebook/cell.py.orig 2018-11-05 08:45:39.000000000 -0700 +++ build/pkgs/sagenb/src/sagenb/notebook/cell.py 2019-01-04 10:28:38.100158204 -0700 @@ -2387,8 +2387,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/notebook/run_notebook.py.orig build/pkgs/sagenb/src/sagenb/notebook/run_notebook.py --- build/pkgs/sagenb/src/sagenb/notebook/run_notebook.py.orig 2018-11-05 08:45:39.000000000 -0700 +++ build/pkgs/sagenb/src/sagenb/notebook/run_notebook.py 2019-01-04 10:28:38.101158185 -0700 @@ -53,12 +53,11 @@ sagenb.notebook.misc.DIR = %(cwd)r #We s # Flask # ######### import os, sys, random -import sagenb.flask_version.base as flask_base -opts={} +sagenb_dir = os.path.join(os.environ['SAGE_ROOT'], 'src', 'sagenb') +sys.path.append(sagenb_dir) +import flask_version.base as flask_base 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...")