Browse Source

distributed: Fix the import test (and syntax on Python 3)

Sam Edwards 7 years ago
parent
commit
df0c889092

+ 2 - 2
direct/src/distributed/DistributedObjectAI.py

@@ -340,10 +340,10 @@ class DistributedObjectAI(DistributedObjectBase):
             self.air.sendUpdate(self, fieldName, args)
             self.air.sendUpdate(self, fieldName, args)
 
 
     def GetPuppetConnectionChannel(self, doId):
     def GetPuppetConnectionChannel(self, doId):
-        return doId + (1001L << 32)
+        return doId + (1001 << 32)
 
 
     def GetAccountConnectionChannel(self, doId):
     def GetAccountConnectionChannel(self, doId):
-        return doId + (1003L << 32)
+        return doId + (1003 << 32)
 
 
     def GetAccountIDFromChannelCode(self, channel):
     def GetAccountIDFromChannelCode(self, channel):
         return channel >> 32
         return channel >> 32

+ 2 - 2
direct/src/distributed/DistributedObjectUD.py

@@ -270,10 +270,10 @@ class DistributedObjectUD(DistributedObjectBase):
             self.air.sendUpdate(self, fieldName, args)
             self.air.sendUpdate(self, fieldName, args)
 
 
     def GetPuppetConnectionChannel(self, doId):
     def GetPuppetConnectionChannel(self, doId):
-        return doId + (1001L << 32)
+        return doId + (1001 << 32)
 
 
     def GetAccountConnectionChannel(self, doId):
     def GetAccountConnectionChannel(self, doId):
-        return doId + (1003L << 32)
+        return doId + (1003 << 32)
 
 
     def GetAccountIDFromChannelCode(self, channel):
     def GetAccountIDFromChannelCode(self, channel):
         return channel >> 32
         return channel >> 32

+ 0 - 1
makepanda/test_imports.py

@@ -98,7 +98,6 @@ import direct.distributed.InterestWatcher
 import direct.distributed.MsgTypes
 import direct.distributed.MsgTypes
 import direct.distributed.MsgTypesCMU
 import direct.distributed.MsgTypesCMU
 import direct.distributed.NetMessenger
 import direct.distributed.NetMessenger
-import direct.distributed.OldClientRepository
 import direct.distributed.ParentMgr
 import direct.distributed.ParentMgr
 import direct.distributed.PyDatagram
 import direct.distributed.PyDatagram
 import direct.distributed.PyDatagramIterator
 import direct.distributed.PyDatagramIterator