|
 |
34b5d7d |
diff -up src/sage/interfaces/jmoldata.py.orig src/sage/interfaces/jmoldata.py
|
|
 |
55beead |
--- src/sage/interfaces/jmoldata.py.orig 2018-12-22 16:37:08.000000000 -0700
|
|
|
55beead |
+++ src/sage/interfaces/jmoldata.py 2019-01-16 09:43:40.755939704 -0700
|
|
|
925e91d |
@@ -148,8 +148,6 @@ class JmolData(SageObject):
|
|
|
0fdebf2 |
sage: print(os.path.exists(testfile)) # optional -- java
|
|
|
34b5d7d |
True
|
|
|
34b5d7d |
"""
|
|
|
34b5d7d |
- # Set up paths, file names and scripts
|
|
|
eaa777c |
- jmolpath = os.path.join(JMOL_DIR, "JmolData.jar")
|
|
|
3aa9b0c |
target_native = targetfile
|
|
|
1a0bd1a |
|
|
|
3aa9b0c |
if sys.platform == 'cygwin':
|
|
|
1a0bd1a |
@@ -173,10 +171,8 @@ class JmolData(SageObject):
|
|
|
3aa9b0c |
env = dict(os.environ)
|
|
|
3aa9b0c |
env['LC_ALL'] = 'C'
|
|
|
3aa9b0c |
env['LANG'] = 'C'
|
|
|
34b5d7d |
- subprocess.call(["java", "-Xmx512m", "-Djava.awt.headless=true",
|
|
|
925e91d |
- "-jar", jmolpath, "-iox", "-g", size_arg,
|
|
|
3aa9b0c |
- "-J", launchscript, "-j", imagescript],
|
|
|
3aa9b0c |
- stdout=jout, stderr=jout, env=env)
|
|
|
925e91d |
+ subprocess.call(["jmol", "-n", "-g", size_arg,
|
|
|
925e91d |
+ "-J", launchscript, "-j", imagescript], stdout=jout)
|
|
|
34b5d7d |
if not os.path.isfile(targetfile):
|
|
|
34b5d7d |
raise RuntimeError("Jmol failed to create file %s, see %s for details"%(repr(targetfile), repr(scratchout)))
|
|
|
34b5d7d |
os.unlink(scratchout)
|