Ticket #7514: sagenb-7514-rebase.patch

File sagenb-7514-rebase.patch, 2.4 KB (added by was, 11 years ago)

rebased against sagenb-0.4.8 + trac #7483.

  • sagenb/misc/sageinspect.py 

    # HG changeset patch
# User William Stein <wstein@gmail.com>
# Date 1262281848 28800
# Node ID f19a0ed4113db84008f43930ffac2204cb8d361a
# Parent  809ab7de9057eb6ff19b88f8ec890428638ba9a6
trac 7514 -- rewrite load and attach (rebase against sagenb-0.4.8 + #7482)

diff --git a/sagenb/misc/sageinspect.py b/sagenb/misc/sageinspect.py
    a b  
    5454
    5555Python classes::
    5656
     57    sage: import sage.misc.attach
    5758    sage: sage_getfile(sage.misc.attach.Attach)
    5859    '.../attach.py'
    5960
    6061    sage: sage_getdoc(sage.misc.attach.Attach).lstrip()
    61     "Attach a file to a running instance of Sage..."
     62    'Attach a file to a running instance of Sage...'
    6263
    6364    sage: sage_getsource(sage.misc.attach.Attach)
    6465    'class Attach:...'

  • sagenb/misc/support.py 

    diff --git a/sagenb/misc/support.py b/sagenb/misc/support.py
    a b  
    539539        return False
    540540
    541541from sagenb.interfaces.format import displayhook_hack
    542 def preparse_worksheet_cell(s):
     542def preparse_worksheet_cell(s, globals):
    543543    """
    544544    Preparse the contents of a worksheet cell in the notebook,
    545545    respecting the user using ``preparser(False)`` to turn off the
    … …  
    556556        - string
    557557    """
    558558    if do_preparse():
    559         s = preparse_file(s, magic=True, do_time=True, ignore_prompts=False, reload_attached=True)
     559        s = preparse_file(s, globals=globals)
    560560    return displayhook_hack(s)

  • sagenb/notebook/worksheet.py 

    diff --git a/sagenb/notebook/worksheet.py b/sagenb/notebook/worksheet.py
    a b  
    3939                               WorksheetProcess_RemoteExpectImplementation)
    4040
    4141                         
    42 from sagenb.misc.support import preparse_file
    4342import sagenb.misc.support  as support
    4443
    4544# Imports specifically relevant to the sage notebook
    … …  
    36233622        return support.get_rightmost_identifier(s)
    36243623
    36253624    def preparse(self, s):
    3626         return 'exec _support_.preparse_worksheet_cell(base64.b64decode("%s"))'%base64.b64encode(s)
    3627     #return 'exec _support_.displayhook_hack(_support_.preparse_file(base64.b64decode("%s"),magic=True,do_time=True,ignore_prompts=False,reload_attached=True))'%base64.b64encode(s)
     3625        return 'exec _support_.preparse_worksheet_cell(base64.b64decode("%s"),globals())'%base64.b64encode(s)
    36283626
    36293627    ##########################################################
    36303628    # Loading and attaching files