Changeset 3166

Timestamp:

Nov 29, 2017 10:38:49 PM (6 years ago)

Author:

toby

Message:

Misc Py3 fixes

Location:

trunk

Files:

• docs/find_undoc.py (modified) (1 diff)
• makeBat.py (modified) (5 diffs)
• makeLinux.py (added)
• makeMacApp.py (modified) (2 diffs)
• scanCCD.py (modified) (7 diffs)
• testDeriv.py (modified) (3 diffs)
• testSSymbols.py (modified) (1 diff)
• testinp/genhkltest.py (modified) (3 diffs)
• unit_tests.py (modified) (1 diff)

trunk/docs/find_undoc.py

@@ -36 +36 @@
         continue
     else:
-        print fil+' undocumented'
+        print(fil+' undocumented')
         undoc.append(fil)
 # generate code to place in a .rst file
 if undoc:
-    print "\n# place this code somewhere in the .rst files\n#"
+    print("\n# place this code somewhere in the .rst files\n#")
 for fil in undoc:
-    print ".. automodule:: "+os.path.splitext(os.path.split(fil)[1])[0]
-    print "    :members: "
-    print ""
+    print(".. automodule:: "+os.path.splitext(os.path.split(fil)[1])[0])
+    print("    :members: ")
+    print("")

trunk/makeBat.py

@@ -55 +55 @@
     # Bob reports a problem using pythonw.exe w/Canopy on Windows, so change that if used
     if pythonexe.lower().endswith('pythonw.exe'):
-        print "  using python.exe rather than "+pythonexe
+        print("  using python.exe rather than "+pythonexe)
         pythonexe = os.path.join(os.path.split(pythonexe)[0],'python.exe')
-        print "  now pythonexe="+pythonexe
+        print("  now pythonexe="+pythonexe)
     # create a GSAS-II script
     fp = open(os.path.join(G2bat),'w')
@@ -68 +68 @@
     fp.write(Script.format(pexe,G2s))
     fp.close()
-    print '\nCreated GSAS-II batch file RunGSASII.bat in '+gsaspath
+    print('\nCreated GSAS-II batch file RunGSASII.bat in '+gsaspath)
 
     # Associate a script and icon with .gpx files
@@ -84 +84 @@
     winreg.CloseKey(openkey)
     winreg.CloseKey(gpxkey)
-    print 'Assigned icon and batch file to .gpx files'
+    print('Assigned icon and batch file to .gpx files')
 
     try:
@@ -91 +91 @@
             win32com.shell.shellcon.SHCNE_ASSOCCHANGED, 0, None, None)
     except ImportError:
-        print 'Module pywin32 not present, login again to see file types properly'
+        print('Module pywin32 not present, login again to see file types properly')
     except:
-        print 'Unexpected error on explorer refresh. Please report:'
+        print('Unexpected error on explorer refresh. Please report:')
         import traceback
-        print traceback.format_exc()
+        print(traceback.format_exc())
 
     # make a desktop shortcut to GSAS-II
@@ -109 +109 @@
         shobj.IconLocation = G2icon
         shobj.save()
-        print 'Created shortcut to start GSAS-II on desktop'
+        print('Created shortcut to start GSAS-II on desktop')
     except ImportError:
-        print 'Module pywin32 not present, will not make desktop shortcut'
+        print('Module pywin32 not present, will not make desktop shortcut')
     except:
-        print 'Unexpected error making desktop shortcut. Please report:'
+        print('Unexpected error making desktop shortcut. Please report:')
         import traceback
-        print traceback.format_exc()
+        print(traceback.format_exc())
     

trunk/makeMacApp.py

@@ -151 +151 @@
     #print testout,errout
     if testout.strip() != "OK":
-        print 'Run of python app failed, resorting to non-app version of Python, Alas!'
-        pythonapp = sys.executable
-        # is this brain-dead Canopy 1.4.0, if so, switch to pythonw
-        try:
-            import canopy.version
-            if canopy.version.version == '1.4.0':
-                print 'using pythonw for Canopy 1.4.0'
-                pythonapp = os.path.join(os.path.split(pythonapp)[0],'pythonw')
-                if not os.path.exists(pythonapp):
-                    raise Exception('no pythonw here: '+pythonapp)
-        except ImportError:
-            pass
+        print('Run of wx in python failed, looking for pythonw')
+        pythonapp = os.path.join(os.path.split(sys.executable)[0],'pythonw')
+        if not os.path.exists(pythonapp):
+            raise Exception('no pythonw found with '+sys.executable)
         newpython = pythonapp
     else:
@@ -179 +171 @@
     try: 
         subprocess.check_output(["osacompile","-o",apppath,shell],stderr=subprocess.STDOUT)
-    except subprocess.CalledProcessError, msg:
-        print '''Error compiling AppleScript.
-        Report the next message along with details about your Mac to toby@anl.gov'''
-        print msg.output
+    except subprocess.CalledProcessError as msg:
+        print('''Error compiling AppleScript.
+        Report the next message along with details about your Mac to toby@anl.gov''')
+        print(msg.output)
         sys.exit()
 

trunk/scanCCD.py

@@ -167 +167 @@
         
         import histosigma2d as h2d
-        print 'Begin image integration'
+        print('Begin image integration')
         scaley = self.data['pixel'][1]/1000.
         tthStart,tthEnd,tthStep = self.data['2thScan']
@@ -204 +204 @@
                             jBeg = jBlk*blkSize
                             jFin = jBeg+blkSize                
-                            print 'Process map block:',nBlk,iBlk,jBlk,' offset:',iBegi,' limits:',iBeg,iFin,jBeg,jFin
+                            print('Process map block:',nBlk,iBlk,jBlk,' offset:',iBegi,' limits:',iBeg,iFin,jBeg,jFin)
                             TA = Make2ThetaMap(self.data,(iBeg,iFin),(jBeg,jFin))           #2-theta & Y arrays & create position mask                       
                             Block = image[iBeg-iBegi:iFin-iBegi,jBeg:jFin]
@@ -224 +224 @@
                                 break
                 else:
-                    print 'file '+imagefile+' skipped'
+                    print('file '+imagefile+' skipped')
                     nBlk += N*N
                     GoOn = dlg.Update(nBlk)[0]
@@ -240 +240 @@
             dlg.Destroy()
         Scale = np.sum(Qmat)/np.sum(H0)
-        print 'SumI: ',np.sum(H0),' SumV: ',np.sum(Qmat),' Scale:',Scale
-        print 'Integration complete'
-        print "Elapsed time:","%8.3f"%(t1-t0), "s"
+        print('SumI: ',np.sum(H0),' SumV: ',np.sum(Qmat),' Scale:',Scale)
+        print('Integration complete')
+        print("Elapsed time:","%8.3f"%(t1-t0), "s")
         self.Hxyw = [H1,Scale*H0.T[0],np.sqrt(Qmat.T[0])]
-        print 
+        print()
         self.PlotXY(self.Hxyw,True,type='Integration result')
         
@@ -252 +252 @@
             file = open(powderfile,'w')
             file.write('#%s\n'%('from scanCCD image '+self.imagefiles[0]))
-            print 'save powder pattern to file: ',powderfile
+            print('save powder pattern to file: ',powderfile)
             wx.BeginBusyCursor()
             try:
@@ -269 +269 @@
             finally:
                 wx.EndBusyCursor()
-            print 'powder pattern file written'
+            print('powder pattern file written')
         
         if not self.Hxyw:
@@ -280 +280 @@
         try:
             if dlg.ShowModal() == wx.ID_OK:
-                print dlg.GetFilename()
+                print(dlg.GetFilename())
                 powderfile = dlg.GetPath()
                 if 'fxye' in powderfile:

trunk/testDeriv.py

@@ -105 +105 @@
                 G2mv.GenerateConstraints(groups,parmlist,self.varylist,self.constrDict,self.fixedList,self.parmDict)
                 self.UpdateControls(event)
-                print G2mv.VarRemapShow(self.varylist)
-                print 'Dependent Vary List:',self.depVarList
+                print(G2mv.VarRemapShow(self.varylist))
+                print('Dependent Vary List:',self.depVarList)
         finally:
             dlg.Destroy()
@@ -165 +165 @@
             sortby = 'tottime'
             ps = pstats.Stats(pr, stream=s).strip_dirs().sort_stats(sortby)
-            print 'Profiler of function calculation; top 50% of routines:'
+            print('Profiler of function calculation; top 50% of routines:')
             ps.print_stats("GSASII",.5)
-            print s.getvalue()
+            print(s.getvalue())
             fplot.plot(M,'r',label='M')
             fplot.legend(loc='best')
@@ -186 +186 @@
                 ps = pstats.Stats(pr, stream=s).strip_dirs().sort_stats(sortby)
                 ps.print_stats("GSASII",.5)
-                print 'Profiler of '+name+' derivative calculation; top 50% of routines:'
-                print s.getvalue()
+                print('Profiler of '+name+' derivative calculation; top 50% of routines:')
+                print(s.getvalue())
             M2 = dMdV[varyList.index(name)]
             hplot.plot(M2,'b',label='analytic deriv')
             mmin = np.min(dMdV[varyList.index(name)])
             mmax = np.max(dMdV[varyList.index(name)])
-            print 'parameter:',name,self.parmDict[name],delt,mmin,mmax
+            print('parameter:',name,self.parmDict[name],delt,mmin,mmax)
             if name in self.varylist:
                 self.values[self.varylist.index(name)] -= delt

trunk/testSSymbols.py

@@ -100 +100 @@
                 msg = 'Superspace Group Information'
                 G2G.SGMessageBox(self,msg,text,table).Show()
-                print 'Super spacegroup operators for '+SSGData['SSpGrp']
+                print('Super spacegroup operators for '+SSGData['SSpGrp'])
                 for Op in SSGData['SSGOps']:
-                    print G2spc.SSMT2text(Op).replace(' ','')
+                    print(G2spc.SSMT2text(Op).replace(' ',''))
                 if SGData['SGInv']:                                 
                     for Op in SSGData['SSGOps']:
                         Op = [-Op[0],-Op[1]%1.]
-                        print G2spc.SSMT2text(Op).replace(' ','')                                 
+                        print(G2spc.SSMT2text(Op).replace(' ',''))
             else:
                 text = [E+'\nSuperspace Group set to previous']

trunk/testinp/genhkltest.py

@@ -30 +30 @@
     #ms.show_summary()
     spcg = ("%s" %  ms.space_group_info()).split(':')[0]
-    print spcg
+    print(spcg)
     fp.write("'%s': [\n" % spcg)
     fp.write("%s ,\n" % ms.unit_cell())
@@ -37 +37 @@
         if hkllist.has_key(d):
             hkllist[d].append(hkl)
-            print hkllist[d]
+            print(hkllist[d])
         else:
             hkllist[d] = [hkl,]
@@ -89 +89 @@
     if len(spcglist) > 1:
         if spcglist[1] == 'R': spcg += ' R'
-    print spcg
+    print(spcg)
     #fp.write("'%s': [\n" % spcg)
     fp.write("'%s': [\n" % sg)

trunk/unit_tests.py

@@ -35 +35 @@
     test_GSASIIspc()
     test_GSASIIlattice()
-    print "OK"
+    print("OK")