Ticket #9739: trac_9739-delta2to3.patch

File trac_9739-delta2to3.patch, 1.9 KB (added by jhpalmieri, 9 years ago)

for review only

  • sage-doctest

    diff --git a/sage-doctest b/sage-doctest
    a b def extract_doc(file_name, library_code= 
    416416        F = pythonify_rst(F)
    417417 
    418418    s = "# -*- coding: utf-8 -*-\n"
     419    s += """
     420# This file was generated by 'sage-doctest' from
     421# '%s'.
     422
     423"""  % os.path.join(os.getcwd(), file_name)
    419424    s += "from sage.all_cmdline import *; \n"
    420425    s += "import sage.plot.plot; sage.plot.plot.DOCTEST_MODE=True\n"  # turn off image popup
    421426    s += """
    def test_file(file, library_code): 
    644649
    645650        name = os.path.basename(file)
    646651        name = name[:name.find(".")]
    647         f = os.path.join(SAGE_TESTDIR, "%s_%s.py" % (name, os.getpid()))
     652        f = os.path.join(SAGE_TESTDIR, "%s_%d.py" % (name, os.getpid()))
    648653
    649654        open(f,"w").write(s)
    650655        tmpfiles.append(f)
  • sage-ptest

    diff --git a/sage-ptest b/sage-ptest
    a b for gr in range(0,numglobaliteration): 
    295295
    296296        infiles.append(os.path.join(sagenb_loc, 'sagenb'))
    297297
    298     verbose = '-verbose' in opts
     298    verbose = ('-verbose' in opts or '--verbose' in opts)
    299299
    300300    if numthreads == 0:
    301301        # Set numthreads to be the number of processors, with a default
    for gr in range(0,numglobaliteration): 
    430430        # TODO (probably in sage-doctest): if tests were interrupted
    431431        # but there were no failures in the interrupted files, delete
    432432        # the temporary files, so that this directory is empty.
    433         print "Warning: the temporary doctesting directory"
     433        print "The temporary doctesting directory"
    434434        print "   %s" % TMP
    435         print "was not removed: it is not empty, probably because doctesting"
    436         print "failed or was interrupted."
     435        print "was not removed: it is not empty, presumably because doctests"
     436        print "failed or doctesting was interrupted."
    437437        print
    438438        print "-"*int(70)
    439439