TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sam Edwards 2018-02-23 19:52:37 -07:00
parent dfed8d2100
commit df0c889092
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
direct/src/distributed/DistributedObjectAI.py
View File

@ -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

4
direct/src/distributed/DistributedObjectUD.py
View File

@ -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

1
makepanda/test_imports.py
View File

@ -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