Преглед на файлове

Fix assorted instances of leftover Python 3 syntax

Closes #1490
max преди 2 години
родител
ревизия
cc74efa79a

+ 3 - 3
contrib/src/panda3dtoolsgui/Panda3DToolsGUI.py

@@ -1905,7 +1905,7 @@ class main(wx.Frame):
                             self.txaExtraLines.append(line)
                 txafile.close()
             except:
-                print "Error opening .txa file!"
+                print("Error opening .txa file!")
             self.palettize_saveTxaTxt.SetValue(os.path.join(dirname + os.sep , filename))
         dlg.Destroy()
 
@@ -2705,7 +2705,7 @@ class main(wx.Frame):
             selectedItemIndex = int(self.batchTree.GetItemText(selectedItemId).split()[0])-1
             batchItem = self.batchList[selectedItemIndex]
 
-            print '\n'+self.BuildCommand(batchItem)
+            print('\n'+self.BuildCommand(batchItem))
 
             if (batchItem['cmd'].count('maya2egg')):
                 # Display Maya2Egg Tool Panel
@@ -2840,7 +2840,7 @@ class main(wx.Frame):
                                 self.txaExtraLines.append(line)
                     txafile.close()
                 except:
-                    print "Error opening .txa file!"
+                    print("Error opening .txa file!")
 
             self.batchItemNameTxt.SetValue(batchItem['label'])
 

+ 3 - 3
panda/src/iphone/ipfreeze.py

@@ -17,8 +17,8 @@ import os
 from direct.dist import FreezeTool
 
 def usage(code, msg = ''):
-    print >> sys.stderr, __doc__
-    print >> sys.stderr, msg
+    print(__doc__, file=sys.stderr)
+    print(msg, file=sys.stderr)
     sys.exit(code)
 
 if __name__ == '__main__':
@@ -30,7 +30,7 @@ if __name__ == '__main__':
 
     try:
         opts, args = getopt.getopt(sys.argv[1:], 'h')
-    except getopt.error, msg:
+    except getopt.error as msg:
         usage(1, msg)
 
     for opt, arg in opts:

+ 1 - 1
panda/src/iphone/provision.py

@@ -34,7 +34,7 @@ command = 'env CODESIGN_ALLOCATE="/Developer/Platforms/iPhoneOS.platform/Develop
     'xcent' : xcent,
     }
 
-print command
+print(command)
 result = os.system(command)
 if result != 0:
     raise StandardError

+ 6 - 6
panda/src/testbed/test_native_net1.py

@@ -11,7 +11,7 @@ SocketIP.InitNetworkDriver();
 
 addr = SocketAddress()
 addr.setHost("127.0.0.1",8080)
-print addr.getIpPort()
+print(addr.getIpPort())
 
 
 inbound = SocketTCPListen()
@@ -23,16 +23,16 @@ while 1 == 1:
     source = SocketAddress()
     if inbound.GetIncomingConnection(newsession,source) :
         #newsession.SetNonBlocking();
-        print source.getIpPort()
+        print(source.getIpPort())
         newsession.SendData("Hello From the Listener\n\r");
 
         s = newsession.RecvData(10);
-        print s
-        print newsession.GetLastError()
+        print(s)
+        print(newsession.GetLastError())
         if newsession.ErrorIsWouldBlocking(newsession.GetLastError()) :
-            print  "Reading Would Block"
+            print("Reading Would Block")
         else:
-            print "Not A Blocking Error"
+            print("Not A Blocking Error")
 
         newsession.SendData("GoodBy From the Listener\n\r");
         newsession.Close();

+ 3 - 3
panda/src/testbed/test_native_net2.py

@@ -15,7 +15,7 @@ SocketIP.InitNetworkDriver();
 
 addr = SocketAddress()
 addr.setHost("127.0.0.1",6666)
-print addr.getIpPort()
+print(addr.getIpPort())
 
 MyConection = BufferedDatagramConnection(0,4096000,4096000,102400);
 #help(BufferedDatagramConnection)
@@ -42,8 +42,8 @@ dg1.addUint16(54321)
 while 1==1:
     for x in range(200000):
         if  not MyConection.SendMessage(dg1):
-            print "Error Sending Message"
+            print("Error Sending Message")
 
     MyConection.Flush();
     time.sleep(1)
-    print "loop"
+    print("loop")

+ 2 - 2
panda/src/testbed/test_native_net3.py

@@ -15,7 +15,7 @@ SocketIP.InitNetworkDriver();
 
 addr = SocketAddress()
 addr.setHost("127.0.0.1",6666)
-print addr.getIpPort()
+print(addr.getIpPort())
 
 MyConection = BufferedDatagramConnection(0,4096000,4096000,102400);
 #help(BufferedDatagramConnection)
@@ -47,4 +47,4 @@ while 1==1:
 
     MyConection.Flush();
     time.sleep(1)
-    print "loop"
+    print("loop")