From af6a45589152d480e6e8fe520a14b85219d245aa Mon Sep 17 00:00:00 2001 From: not-na Date: Mon, 14 Dec 2015 20:20:31 +0100 Subject: [PATCH] Fix missing files in pypi --- packetmq/__init__.py | 2 +- packetmq/test/__init__.py | 20 +++++++++++++------- setup.py | 1 + 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/packetmq/__init__.py b/packetmq/__init__.py index 75e011d..d2d9e23 100644 --- a/packetmq/__init__.py +++ b/packetmq/__init__.py @@ -276,7 +276,7 @@ def sendPacket(self,data,dtype,to=None): to = self.default_peer pobj = self.registry.packetObj(dtype) dprint("Calling send callbacks...") - data,to = pobj.send(data,to,self) + data,to,fromobj = pobj.send(data,to,self) dprint("dtype: %s"%dtype) self.peerObj(to).recvPacket(data,dtype,self) def sendEncoded(self,raw,to=None): diff --git a/packetmq/test/__init__.py b/packetmq/test/__init__.py index b429771..e4e2e98 100644 --- a/packetmq/test/__init__.py +++ b/packetmq/test/__init__.py @@ -115,24 +115,30 @@ def test_delPacket(self): class TCPServerTestCase(unittest.TestCase): def setUp(self): - self.reg = packetmq.PacketRegistry() - self.reg.registerDefaultPackets() + self.regs = packetmq.PacketRegistry() + self.regs.registerDefaultPackets() + + self.regc = packetmq.PacketRegistry(adaptPacketIds=True) + self.regc.registerDefaultPackets() self.testpacket = TestPacket() - self.reg.addPacket("packetmq:test",self.testpacket,17) + self.regc.addPacket("packetmq:test",self.testpacket,17) + self.regs.addPacket("packetmq:test",self.testpacket,17) - self.server = packetmq.Server(self.reg) + self.server = packetmq.Server(self.regs) self.proto = self.server.factory.buildProtocol(('127.0.0.1', 0)) self.tr = proto_helpers.StringTransport() - self.client = packetmq.Client(self.reg) + self.client = packetmq.Client(self.regc) self.client.factory.clients[0]=self.proto - self.proto.makeConnection(self.tr) self.proto.transport = self.tr self.proto.sendString = self.proto.stringReceived + self.proto.makeConnection(self.tr) + self.proto.connectionMade() + time.sleep(0.5) def test_connStateServer(self): @@ -182,6 +188,6 @@ def test_packetSend2Client(self): def test_disconnect(self): self.client.disconnect() - self.assertRaises(ValueError,self.client.sendPacket,{"foo":"bar"},"packetmq:test") + self.assertRaises(TypeError,self.client.sendPacket,{"foo":"bar"},"packetmq:test") self.assertRaises(KeyError,self.server.sendPacket,{"foo":"bar"},"packetmq:test",0) diff --git a/setup.py b/setup.py index 3c1a139..9d4a353 100644 --- a/setup.py +++ b/setup.py @@ -36,6 +36,7 @@ packages=['packetmq', ], package_data={'packetmq': ['docs/source/*']}, + data_files=[(".",["pypi.rst", "README.md", "requirements.txt"])] requires=["twisted","msgpack","bidict"], provides=["packetmq"], classifiers=["Development Status :: 4 - Beta",