Update to sagemath 6.3

This commit is contained in:
pcpa 2014-08-15 13:30:04 -03:00
parent 86aa0a3b29
commit 886f9fabef
22 changed files with 1019 additions and 1023 deletions

View file

@ -1,16 +1,7 @@
diff -up src/sage/interfaces/jmoldata.py.orig src/sage/interfaces/jmoldata.py
--- src/sage/interfaces/jmoldata.py.orig 2014-02-07 12:31:50.599827821 -0200
+++ src/sage/interfaces/jmoldata.py 2014-02-07 12:34:31.334833976 -0200
@@ -64,7 +64,7 @@ class JmolData(SageObject):
sage_makedirs(jmolscratch)
scratchout = os.path.join(jmolscratch,"jmolout.txt")
jout=open(scratchout,'w')
- testjavapath = os.path.join(SAGE_LOCAL, "share", "jmol", "testjava.sh")
+ testjavapath = os.path.join(SAGE_LOCAL, "bin", "testjava.sh")
result = subprocess.call([testjavapath],stdout=jout)
jout.close()
if (result == 0):
@@ -144,8 +144,6 @@ class JmolData(SageObject):
--- src/sage/interfaces/jmoldata.py.orig 2014-08-12 14:13:57.189963669 -0300
+++ src/sage/interfaces/jmoldata.py 2014-08-12 14:16:21.359969189 -0300
@@ -139,8 +139,6 @@ class JmolData(SageObject):
True
"""
@ -19,7 +10,7 @@ diff -up src/sage/interfaces/jmoldata.py.orig src/sage/interfaces/jmoldata.py
launchscript = ""
if (datafile_cmd!='script'):
launchscript = "load "
@@ -157,9 +155,8 @@ class JmolData(SageObject):
@@ -152,9 +150,8 @@ class JmolData(SageObject):
scratchout = tmp_filename(ext=".txt")
with open(scratchout, 'w') as jout:
# Now call the java application and write the file.