Changeset 2160

Timestamp:

Mar 1, 2016 9:58:30 AM (8 years ago)

Author:

vondreele

Message:

fix zip file problem

File:

• trunk/GSASII.py (modified) (2 diffs)

trunk/GSASII.py

@@ -1284 +1284 @@
                 instfile = G2IO.ExtractFileFromZip(self.zipfile,
                     selection=os.path.split(basename + ext)[1],parent=self)
+                if instfile == None:
+                    continue
             else:
                 instfile = basename + ext
@@ -1321 +1323 @@
                 instfile = G2IO.ExtractFileFromZip(self.zipfile,
                     selection=os.path.split(instfile)[1],parent=self)
-            if os.path.exists(instfile):
+            if instfile != None and os.path.exists(instfile):
                 #print 'debug: try read',instfile
                 if 'instprm' in instfile:   #GSAS-II file must have .instprm as extension