Ticket #13147: 13147_lazy_spkg.patch

sage/interfaces/cleaner.py

@@ -15 +15 @@
 import os
 
 import sage.misc.misc as misc
-F = '%s/spawned_processes'%misc.SAGE_TMP
 
 def cleaner(pid, cmd=''):
     if cmd != '':
         cmd = cmd.strip().split()[0]
     # This is safe, since only this process writes to this file.
+    F = '%s/spawned_processes'%misc.SAGE_TMP
     if os.path.exists(F):
         o = open(F,'a')
     else:
-        if not os.path.exists(misc.SAGE_TMP):
+        if not os.path.exists(str(misc.SAGE_TMP)):
             return
         o = open(F,'w')
     o.write('%s %s\n'%(pid, cmd))

sage/interfaces/quit.py

@@ -13 +13 @@
 ################################################################################
 
 import os
+from sage.misc.misc import SAGE_TMP
 
 expect_objects = []
 
@@ -63 +64 @@
 
         sage: sage.interfaces.quit.expect_quitall()
     """
-    from sage.misc.misc import SAGE_TMP
-    file = os.path.join(SAGE_TMP, 'spawned_processes')
+    file = os.path.join(str(SAGE_TMP), 'spawned_processes')
     if not os.path.exists(file):
         return 
     for L in open(file).readlines():

sage/misc/dist.py

@@ -70 +70 @@
 
     EXAMPLES::
 
-        sage: install_scripts(SAGE_TMP, ignore_existing=True)
+        sage: install_scripts(str(SAGE_TMP), ignore_existing=True) # SAGE_TMP is lazy
         Checking that Sage has the command 'gap' installed
         ...
     """

sage/misc/misc.py

@@ -133 +133 @@
 # It is called temp instead of tmp mainly for
 # "historical reasons"...
 
-SAGE_TMP='%s/temp/%s/%s/'%(DOT_SAGE, HOSTNAME, os.getpid())
+def lazy_string(func):
+    """
+    Creates a lazy string that gets its values by evaluating a
+    function that takes no parameters.
 
-sage_makedirs(SAGE_TMP)
+    EXAMPLES::
+
+        sage: from sage.misc.misc import lazy_string
+        sage: def foo(): return 'sage'
+        sage: s = lazy_string(foo); s
+        l'sage'
+        sage: s + 'math'
+        'sagemath'
+    """
+    from speaklater import make_lazy_string
+    return make_lazy_string(func)
+
+@lazy_string
+def SAGE_TMP():
+    d = '%s/temp/%s/%s/'%(DOT_SAGE, HOSTNAME, os.getpid())
+    sage_makedirs(d)
+    return d
+
+@lazy_string
+def SPYX_TMP():
+    return '%s/spyx/'%SAGE_TMP
 
 SAGE_DATA = '%s/data/'%SAGE_ROOT
 SAGE_EXTCODE = '%s/data/extcode/'%SAGE_ROOT
-SPYX_TMP = '%s/spyx/'%SAGE_TMP
-
 
 def delete_tmpfiles():
     # !!!If you change this, see also SAGE_ROOT/local/bin/sage-doctest!!!
     import shutil
     try:
-        if os.path.exists(SAGE_TMP):
-            shutil.rmtree(SAGE_TMP)
+        if os.path.exists(str(SAGE_TMP)):
+            shutil.rmtree(str(SAGE_TMP))
     except OSError, msg:
         print msg
         pass
 
-SAGE_TMP_INTERFACE='%s/interface/'%SAGE_TMP
-sage_makedirs(SAGE_TMP_INTERFACE)
+@lazy_string
+def SAGE_TMP_INTERFACE():
+    d = '%s/interface/'%SAGE_TMP
+    sage_makedirs(d)
+    return d
 
 SAGE_DB = '%s/db'%DOT_SAGE
 sage_makedirs(SAGE_DB)

sage/tests/cmdline.py

@@ -257 +257 @@
         sage: F = open(script, 'w')
         sage: F.write(s)
         sage: F.close()
-        sage: os.chdir(SAGE_TMP)
+        sage: os.chdir(str(SAGE_TMP)) # SAGE_TMP is lazy
         sage: (out, err, ret) = test_executable(["sage", "--preparse", script])
         sage: ret
         0
@@ -286 +286 @@
         sage: F.write(s)
         sage: F.close()
         sage: OLD_TESTDIR = os.environ['SAGE_TESTDIR']
-        sage: os.environ['SAGE_TESTDIR'] = SAGE_TMP
+        sage: os.environ['SAGE_TESTDIR'] = str(SAGE_TMP) # SAGE_TMP is lazy
         sage: (out, err, ret) = test_executable(["sage", "-t", script])
         sage: ret
         128