Support Python 3

Author: repeatedly

README.md

@@ -16,7 +16,7 @@ MessagePack RPC implementation based on Tornado.
 
 # Dependent modules
 
-* msgpack-python (0.1.10)
+* msgpack-python (0.1.12)
 * tornado (2.1.1)
 
 # TODO

msgpackrpc/__init__.py

@@ -1,3 +1,7 @@
+import sys
+
+inPy3k = sys.version_info[0] == 3
+
 from pkg_resources import get_distribution, DistributionNotFound
 
 try:

msgpackrpc/server.py

@@ -1,5 +1,6 @@
 import msgpack
 
+from msgpackrpc import inPy3k
 from msgpackrpc import error
 from msgpackrpc import loop
 from msgpackrpc import message
@@ -12,7 +13,6 @@ class Server(session.Session):
     """
 
     def __init__(self, dispatcher, loop=loop.Loop(), builder=tcp):
-        #session.Session.__init__(self, address, timeout, loop, builder)
         self._loop = loop
         self._builder = builder
         self._listeners = []
@@ -32,7 +32,6 @@ def stop(self):
     def close(self):
         for listener in self._listeners:
             listener.close()
-        #session.Session.close(self)
 
     def on_request(self, sendable, msgid, method, param):
         self.dispatch(method, param, _Responder(sendable, msgid))
@@ -42,6 +41,8 @@ def on_notify(self, method, param):
 
     def dispatch(self, method, param, responder):
         try:
+            if inPy3k:
+                method = method.decode("utf-8")
             if not hasattr(self._dispatcher, method):
                 raise error.NoMethodError("{0} not found".format(method))
             responder.set_result(getattr(self._dispatcher, method)(*param))

msgpackrpc/session.py

@@ -1,5 +1,6 @@
 import msgpack
 
+from msgpackrpc import inPy3k
 from msgpackrpc import loop
 from msgpackrpc import message
 from msgpackrpc.error import RPCError
@@ -46,7 +47,7 @@ def call_async(self, method, *args):
 
     def send_request(self, method, args):
         # need lock?
-        msgid = self._generator.next()
+        msgid = next(self._generator)
         future = Future(self._loop, self._timeout)
         self._request_table[msgid] = future
         self._transport.send_message([message.REQUEST, msgid, method, args])
@@ -71,8 +72,15 @@ def on_connect_failed(self, reason):
         Called by the transport layer.
         """
 
+        def _iteritems(dic): # ugly!!!!!!
+            if inPy3k:
+                return dic.items()
+            else:
+                return dic.iteritems()
+
         # set error for all requests
-        for msgid, future in self._request_table.iteritems():
+        #for msgid, future in self._request_table.iteritems():
+        for msgid, future in _iteritems(self._request_table):
             future.set_error(reason)
 
         self._request_table = {}
@@ -116,6 +124,7 @@ def step_timeout(self):
             future.set_error("Request timed out")
         self._loop.start()
 
+
 def _NoSyncIDGenerator():
     """\
     Message ID Generator.

test/test_msgpackrpc.py

@@ -3,6 +3,7 @@
 
 import helper
 import msgpackrpc
+from msgpackrpc import inPy3k
 
 
 class TestMessagePackRPC(unittest.TestCase):
@@ -40,11 +41,15 @@ def tearDown(self):
 
     def test_hello(self):
         client = self.setup_env();
-        self.assertEqual(client.call('hello'), "world", "hello result is incorrect")
+        result = client.call('hello')
+        if inPy3k:
+            result = result.decode("utf-8")
+        self.assertEqual(result, "world", "hello result is incorrect")
 
     def test_add(self):
         client = self.setup_env();
-        self.assertEqual(client.call('sum', 1, 2), 3, "sum result is incorrect")
+        result = client.call('sum', 1, 2)
+        self.assertEqual(result, 3, "sum result is incorrect")
 
 
 if __name__ == '__main__':