Skip to content

distributed: AstronInternalRepository et al is now compatible with Python 3 #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

distributed: AstronInternalRepository et al is now compatible with Python 3 #30

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ef9fef
distributed: Use relative imports and panda3d.core
ksmit799 Jan 11, 2019
8ccc526
distributed: Python3 compat with postRemove
ksmit799 Jan 11, 2019
afb0818
distributed: Use panda3d.direct instead of PandaModules
ksmit799 Jan 11, 2019
7dd59a8
distributed: Further fixes for Python 3
ksmit799 Jan 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions direct/src/distributed/AstronClientRepository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"""AstronClientRepository module: contains the AstronClientRepository class"""

from pandac.PandaModules import STUint16, STUint32
from direct.directnotify import DirectNotifyGlobal
from ClientRepositoryBase import ClientRepositoryBase
from MsgTypes import *
from direct.distributed.PyDatagram import PyDatagram
from pandac.PandaModules import STUint16, STUint32
from .ClientRepositoryBase import ClientRepositoryBase
from .MsgTypes import *

class AstronClientRepository(ClientRepositoryBase):
"""
Expand Down
10 changes: 5 additions & 5 deletions direct/src/distributed/AstronDatabaseInterface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from pandac.PandaModules import *
from MsgTypes import *
from panda3d.core import *
from direct.directnotify import DirectNotifyGlobal
from ConnectionRepository import ConnectionRepository
from PyDatagram import PyDatagram
from PyDatagramIterator import PyDatagramIterator
from .MsgTypes import *
from .ConnectionRepository import ConnectionRepository
from .PyDatagram import PyDatagram
from .PyDatagramIterator import PyDatagramIterator

class AstronDatabaseInterface:
"""
Expand Down
19 changes: 10 additions & 9 deletions direct/src/distributed/AstronInternalRepository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
from pandac.PandaModules import *
from MsgTypes import *
import collections

from panda3d.core import *
from direct.showbase import ShowBase # __builtin__.config
from direct.task.TaskManagerGlobal import * # taskMgr
from direct.directnotify import DirectNotifyGlobal
from ConnectionRepository import ConnectionRepository
from PyDatagram import PyDatagram
from PyDatagramIterator import PyDatagramIterator
from AstronDatabaseInterface import AstronDatabaseInterface
from NetMessenger import NetMessenger
import collections
from .MsgTypes import *
from .ConnectionRepository import ConnectionRepository
from .PyDatagram import PyDatagram
from .PyDatagramIterator import PyDatagramIterator
from .AstronDatabaseInterface import AstronDatabaseInterface
from .NetMessenger import NetMessenger

# Helper functions for logging output:
def msgpack_length(dg, length, fix, maxfix, tag8, tag16, tag32):
Expand Down Expand Up @@ -206,7 +207,7 @@ def addPostRemove(self, dg):
dg2 = PyDatagram()
dg2.addServerControlHeader(CONTROL_ADD_POST_REMOVE)
dg2.addUint64(self.ourChannel)
dg2.addString(dg.getMessage())
dg2.addBlob(dg.getMessage())
self.send(dg2)

def clearPostRemove(self):
Expand Down