Changeset 2736

Timestamp:

Mar 3, 2017 11:03:36 AM (6 years ago)

Author:

toby

Message:

more unicode fixes, fix shelx END problem

Location:

trunk

Files:

• GSASII.py (modified) (8 diffs)
• imports/G2phase_INS.py (modified) (3 diffs)

trunk/GSASII.py

@@ -329 +329 @@
             except Exception,errmsg:
                 print('\nImport_'+errprefix+': Error importing file '+ filename)
-                print('Error message: '+str(errmsg)+'\n')
+                print(u'Error message: {}\n'.format(errmsg))
             if fp: fp.close()
 
@@ -652 +652 @@
             PhaseName = rd.Phase['General']['Name'][:]
             newPhaseList.append(PhaseName)
-            print 'Read phase '+str(PhaseName)+' from file '+str(self.lastimport)
+            print(u'Read phase {} from file {}'.format(PhaseName,self.lastimport))
             if not G2gd.GetPatternTreeItemId(self,self.root,'Phases'):
                 sub = self.PatternTree.AppendItem(parent=self.root,text='Phases')
@@ -1098 +1098 @@
                 Iparm[S[:12]] = S[12:-1]
         except IOError:
-            print('Error reading file:'+str(instfile))
+            print(u'Error reading file: {}'.format(instfile))
         if fp:        
             fp.close()
@@ -1424 +1424 @@
                     return GetDefaultParms(self,rd)
             else:
-                self.ErrorDialog('Open Error','Error opening instrument parameter file '
-                    +str(instfile)+' requested by file '+ filename)
+                self.ErrorDialog('Open Error',
+                                 u'Error opening instrument parameter file '
+                                +'{} requested by file '.format(instfile,filename))
         #Finally - ask user for Instrument parametrs file - seems it can't be in a zip file
         while True: # loop until we get a file that works or we get a cancel
@@ -1464 +1465 @@
                 else:
                     self.ErrorDialog('Read Error',
-                                     'Error opening/reading file '+str(instfile))
+                                     u'Error opening/reading file {}'.format(instfile))
     def EnableRefineCommand(self):
         haveData = False
@@ -1595 +1596 @@
                     print('done')
                 except Exception as err:
-                    print('error: '+str(err))
+                    print(u'error: {}'.format(err))
                     print('with commands -------------------')
-                    print(str(corr))
+                    print(corr)
                     print('---------------------------------')
                 finally:
@@ -1817 +1818 @@
         self.PatternTree.Expand(Id)
         self.PatternTree.SelectItem(Id)
-        print('Added simulation powder data '+HistName+ 
-              ' with parameters from '+str(rd.instmsg))
+        print(u'Added simulation powder data {}'++ 
+              ' with parameters from {}'.format(HistName,rd.instmsg))
 
         # make a list of phase names
@@ -3810 +3811 @@
             if 'pId' not in Phases[phase]:
                 self.ErrorDialog('View parameter error','You must run least squares at least once')
-                raise Exception,'No pId for phase '+str(phase)
+                raise Exception,'No pId for phase '+phase
         rigidbodyDict = self.PatternTree.GetItemPyData(   
             G2gd.GetPatternTreeItemId(self,self.root,'Rigid bodies'))

trunk/imports/G2phase_INS.py

@@ -49 +49 @@
     def Reader(self,filename,filepointer, ParentFrame=None, **unused):
         'Read a ins file using :meth:`ReadINSPhase`'
-        try:
-            self.Phase = self.ReadINSPhase(filename, ParentFrame)
-            return True
-        except Exception as detail:
-            self.errors += '\n  '+str(detail)
-            print 'INS read error:',detail # for testing
-            traceback.print_exc(file=sys.stdout)
-            return False
+        #try:
+        self.Phase = self.ReadINSPhase(filename, ParentFrame)
+        return True
+        #except Exception as detail:
+        #    self.errors += '\n  '+str(detail)
+        #    print 'INS read error:',detail # for testing
+        #    traceback.print_exc(file=sys.stdout)
+        #    return False
 
     def ReadINSPhase(self,filename,parent=None):
@@ -62 +62 @@
         '''
         Shelx = ['TITL','CELL','ZERR','LATT','SYMM','SFAC','DISP','UNIT','LAUE','EADP',
-            'MORE','TIME','END ','HKLF','OMIT','SHEL','BASF','TWIN','EXTI','SWAT',
+            'MORE','TIME','HKLF','OMIT','SHEL','BASF','TWIN','EXTI','SWAT',
             'HOPE','MERG','SPEC','RESI','RTAB','MPLA','HFIX','MOVE','ANIS','AFIX',
             'FRAG','FEND','EXYZ','EDAP','EQIV','CONN','PART','BIND','FREE','DFIX','DANG',
@@ -116 +116 @@
             elif S[:3].upper() == 'REM':
                 pass
-            elif S[:4].upper() not in Shelx:   #this will find an atom record!
+            elif S[:3].upper() == 'END':
+                pass
+            elif S[:4].strip().upper() not in Shelx:   #this will find an atom record!
                 AtRec = S.split()
                 Atype = aTypes[int(AtRec[1])-1]