Changeset 4654 for trunk/GSASIIfiles.py

Timestamp:

Nov 10, 2020 11:24:39 AM (2 years ago)

Author:

toby

Message:

new video tutorial; misc minor RB GUI fixes for Windows; option to show GPX sizes; remove use of deprecated imp module

File:

• trunk/GSASIIfiles.py (modified) (5 diffs)

trunk/GSASIIfiles.py

@@ -28 +28 @@
 import inspect
 import numpy as np
-import imp
 
 import GSASIIpath
@@ -388 +387 @@
 
     readerlist = []
-    pathlist = sys.path[:]
-    if '.' not in pathlist:
-        pathlist.append('.')
-
-    potential_files = []
-    for path in pathlist:
+    import_files = {}
+    if '.' not in sys.path: sys.path.append('.')
+    for path in sys.path:
         for filename in glob.iglob(os.path.join(path, 'G2'+prefix+'*.py')):
-            potential_files.append(filename)
-
-    potential_files = sorted(list(set(potential_files)))
-    for filename in potential_files:
-        path, rootname = os.path.split(filename)
-        pkg = os.path.splitext(rootname)[0]
-
+            pkg = os.path.splitext(os.path.split(filename)[1])[0]
+            if pkg in import_files:
+                G2Print('Warning: file {} hidden by {}'
+                                  .format(os.path.abspath(filename),import_files[pkg]))
+            else:
+                import_files[pkg] = filename            
+
+    for pkg in sorted(import_files.keys()):
         try:
-            fp = None
-            fp, fppath, desc = imp.find_module(pkg, [path])
-            pkg = imp.load_module(pkg, fp, fppath, desc)
-            for name, value in inspect.getmembers(pkg):
+            exec('import '+pkg)
+            for name, value in inspect.getmembers(eval(pkg)):
                 if name.startswith('_'):
                     continue
@@ -420 +415 @@
                             readerlist.append(reader)
         except AttributeError:
-            G2Print ('Import_' + errprefix + ': Attribute Error ' + filename)
+            G2Print ('Import_' + errprefix + ': Attribute Error ' + import_files[pkg])
             if traceback:
                 traceback.print_exc(file=sys.stdout)
         except Exception as exc:
-            G2Print ('\nImport_' + errprefix + ': Error importing file ' + filename)
+            G2Print ('\nImport_' + errprefix + ': Error importing file ' + import_files[pkg])
             G2Print (u'Error message: {}\n'.format(exc))
             if traceback:
                 traceback.print_exc(file=sys.stdout)
-        finally:
-            if fp:
-                fp.close()
-
     return readerlist
 
@@ -438 +429 @@
     '''
     exporterlist = []
-    pathlist = sys.path
-    filelist = []
-    for path in pathlist:
+    import_files = {}
+    if '.' not in sys.path: sys.path.append('.')
+    for path in sys.path:
         for filename in glob.iglob(os.path.join(path,"G2export*.py")):
-                    filelist.append(filename)    
-    filelist = sorted(list(set(filelist))) # remove duplicates
+            pkg = os.path.splitext(os.path.split(filename)[1])[0]
+            if pkg in import_files:
+                G2Print('Warning: file {} hidden by {}'
+                                  .format(os.path.abspath(filename),import_files[pkg]))
+            else:
+                import_files[pkg] = filename            
     # go through the routines and import them, saving objects that
     # have export routines (method Exporter)
-    for filename in filelist:
-        path,rootname = os.path.split(filename)
-        pkg = os.path.splitext(rootname)[0]
+    for pkg in sorted(import_files.keys()):
         try:
-            fp = None
-            fp, fppath,desc = imp.find_module(pkg,[path,])
-            pkg = imp.load_module(pkg,fp,fppath,desc)
-            for clss in inspect.getmembers(pkg): # find classes defined in package
+            exec('import '+pkg)
+            for clss in inspect.getmembers(eval(pkg)): # find classes defined in package
                 if clss[0].startswith('_'): continue
                 if not inspect.isclass(clss[1]): continue
@@ -484 +475 @@
             if traceback:
                 traceback.print_exc(file=sys.stdout)
-        finally:
-            if fp:
-                fp.close()
     return exporterlist