fix use of TestSPG to separate out path hacking

Author: briantoby

GSASII/GSASIIdataGUI.py

@@ -479,7 +479,7 @@ def ShowVersions():
         print('Warning: Python requests package not installed (required for\n'+
               ' GSAS-II to access web pages or self-install binary modules)')
 
-    if not GSASIIpath.TestSPG(GSASIIpath.binaryPath):
+    if not GSASIIpath.TestSPG():
         path2repo = os.path.dirname(GSASIIpath.path2GSAS2)
         installLoc = os.path.join(path2repo,'GSASII-bin')
         binarydir = GSASIIpath.getGitBinaryLoc(verbose=True)
@@ -504,7 +504,7 @@ def ShowVersions():
                         GSASIIpath.SetBinaryPath(True)
                     except:
                         print('Download failed, sorry')
-    if not GSASIIpath.TestSPG(GSASIIpath.binaryPath):
+    if not GSASIIpath.pathhack_TestSPG(GSASIIpath.binaryPath):
         versionDict['errors'] += 'Error accessing GSAS-II binary files. Only limited functionality available.'
     else:
         if GSASIIpath.binaryPath:

GSASII/GSASIIpath.py

@@ -1096,27 +1096,33 @@ def InvokeDebugOpts():
     else: # not in spyder or debug enabled, hide breakpoints
         os.environ['PYTHONBREAKPOINT'] = '0'
 
-def TestSPG(fpth):
-    '''Test if pyspg.[so,.pyd] can be run from a location in the path
+def TestSPG():
+    '''Test if pyspg.[so,.pyd] can be run from a location in the existing path
     Do not modify the path if not.
     '''
     try:
         from . import pyspg
         pyspg
         return True
+    except ImportError:
+        pass
+    try:
+        import pyspg
+        pyspg
     except ImportError:
         return False
     try:
         pyspg.sgforpy('P -1')
     except Exception as err:
         print(70*'=')
-        print(f'Module pyspg in {fpth!r} could not be run\nerror msg: {err}')
+        print(f'Module pyspg in {pyspg.__file__} could not be run\nerror msg: {err}')
         print(70*'=')
         return False
     return True
 
-def _old_TestSPG(fpth):
-    '''Test if pyspg.[so,.pyd] can be run from a location in the path
+def pathhack_TestSPG(fpth):
+    '''Test if pyspg.[so,.pyd] can be run from a specified location. If so 
+    modify the path to include it.
     '''
     try:
         if not os.path.exists(fpth): return False

GSASII/pathHacking.py

@@ -58,7 +58,7 @@ def appendIfExists(searchpathlist,loc,subdir):
             searchpathlist.append(versions[vmax])
         for fpth in searchpathlist:
             if not glob.glob(os.path.join(fpth,'pyspg.*')): continue
-            if GSASIIpath.TestSPG(fpth):
+            if GSASIIpath.pathhack_TestSPG(fpth):
                 binpath = fpth   # got one that works, look no farther!
                 break
         else: