minor cleanup; replacement GSASII/GSASII.py

Author: briantoby

GSASII/GSASII.py

@@ -0,0 +1,25 @@
+# Starts GSAS-II from clone of GitHub repo when contents is not
+# installed into current Python.
+#
+# This can be used when GSAS-II is installed, but why bother as the command:
+#    python -c "from GSASII.GSASIIGUI import main; main()"
+# will do just as well. 
+import os
+import sys
+import importlib
+try:
+    pkginfo = importlib.util.find_spec('GSASII.GSASIIGUI')
+except ModuleNotFoundError:
+    pkginfo = None
+    
+if pkginfo is None:  # fixup path if GSASII not installed into Python
+    os.environ["GSASII_YOLO_PATH"] = "True"
+    #print('GSAS-II not installed in Python: Hacking sys.path')
+    sys.path.insert(0,os.path.dirname(os.path.dirname(__file__)))
+
+from GSASII.GSASIIGUI import main
+
+if __name__ == '__main__':
+    if pkginfo is None:  # fixup path if GSASII not installed into Python
+        print('GSAS-II not installed in Python: Hacking sys.path')
+    main()

GSASII/GSASIIphsGUI.py

@@ -25,7 +25,12 @@
 import sys
 import random as ran
 import subprocess as subp
+import platform
+import shutil
 
+import numpy as np
+import numpy.linalg as nl
+import numpy.ma as ma
 import scipy.optimize as so
 from . import GSASIIpath
 from . import GSASIIlattice as G2lat
@@ -49,13 +54,8 @@
 from . import GSASIIctrlGUI as G2G
 from . import GSASIIfiles as G2fl
 from . import GSASIIconstrGUI as G2cnstG
-import numpy as np
-import numpy.linalg as nl
-import numpy.ma as ma
 from . import atmdata
 from . import ISODISTORT as ISO
-import platform
-from ._utils import _copy_file
 
 # XXX I suspect this is Unix-specific -- need porting help!
 
@@ -6053,7 +6053,9 @@ def OnFileSel(event):
                     if os.path.exists(fName): # is there a file by this name in the current directory?
                         RMCPdict['files'][fil][0] = fName
                     else: # nope, copy it
-                        _copy_file(dlg.GetPath(), os.path.join(G2frame.LastGPXdir,fName))
+                        # TODO: is G2frame.LastGPXdir the right choice here or
+                        #       do I want the current working directory (same?)
+                        shutil.copy(dlg.GetPath(), os.path.join(G2frame.LastGPXdir,fName))
                     if not os.path.exists(fName): # sanity check
                         print(f'Error: file {fName} not found in .gpx directory ({G2frame.LastGPXdir})')
                         return
@@ -7948,7 +7950,6 @@ def Runfullrmc(event):
             finally:
                 dlg.Destroy()
             if result == wx.ID_YES:
-                import shutil
                 shutil.rmtree(rmcname)
             else:
                 return

GSASII/GSASIIstrIO.py

@@ -14,6 +14,7 @@
 import time
 import math
 import random as rand
+import shutil
 import copy
 import pickle as cPickle
 import numpy as np
@@ -27,7 +28,6 @@
 from . import GSASIImath as G2mth
 from . import GSASIIstrMath as G2stMth
 from . import GSASIIfiles as G2fil
-from ._utils import _copy_file
 
 sind = lambda x: np.sin(x*np.pi/180.)
 cosd = lambda x: np.cos(x*np.pi/180.)
@@ -632,7 +632,7 @@ def GPXBackup(GPXfile,makeBack=True):
     tries = 0
     while True:
         try:
-            _copy_file(GPXfile,GPXback)
+            shutil.copy(GPXfile,GPXback)
             break
         except:
             tries += 1