Changeset 2160 for trunk/GSASII.py


Ignore:
Timestamp:
Mar 1, 2016 9:58:30 AM (6 years ago)
Author:
vondreele
Message:

fix zip file problem

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r2159 r2160  
    12841284                instfile = G2IO.ExtractFileFromZip(self.zipfile,
    12851285                    selection=os.path.split(basename + ext)[1],parent=self)
     1286                if instfile == None:
     1287                    continue
    12861288            else:
    12871289                instfile = basename + ext
     
    13211323                instfile = G2IO.ExtractFileFromZip(self.zipfile,
    13221324                    selection=os.path.split(instfile)[1],parent=self)
    1323             if os.path.exists(instfile):
     1325            if instfile != None and os.path.exists(instfile):
    13241326                #print 'debug: try read',instfile
    13251327                if 'instprm' in instfile:   #GSAS-II file must have .instprm as extension
Note: See TracChangeset for help on using the changeset viewer.