Fix missing files in pypi

not-na · Dec 14, 2015 · af6a455 · af6a455
1 parent 86c691d
commit af6a455
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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",