Refactoring.

Author: methane

.gitignore

@@ -3,3 +3,4 @@
 /*.egg-info
 *.pyc
 *.pyo
+.tox

msgpackrpc/__init__.py

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

msgpackrpc/compat.py

@@ -0,0 +1,11 @@
+import sys
+inPy3k = sys.version_info[0] == 3
+
+if inPy3k:
+    def force_str(s):
+        if isinstance(s, bytes):
+            return s.decode('utf-8')
+        return str(s)
+else:
+    def force_str(s):
+        return str(s)

msgpackrpc/server.py

@@ -1,6 +1,6 @@
 import msgpack
 
-from msgpackrpc import inPy3k
+from msgpackrpc.compat import force_str
 from msgpackrpc import error
 from msgpackrpc import Loop
 from msgpackrpc import message
@@ -42,8 +42,7 @@ def on_notify(self, method, param):
 
     def dispatch(self, method, param, responder):
         try:
-            if inPy3k and not isinstance(method, str):
-                method = method.decode("utf-8")
+            method = force_str(method)
             if not hasattr(self._dispatcher, method):
                 raise error.NoMethodError("'{0}' method not found".format(method))
             responder.set_result(getattr(self._dispatcher, method)(*param))

msgpackrpc/session.py

@@ -1,6 +1,5 @@
 import msgpack
 
-from msgpackrpc import inPy3k
 from msgpackrpc import Loop
 from msgpackrpc import message
 from msgpackrpc.error import RPCError
@@ -51,7 +50,6 @@ def send_request(self, method, args):
         future = Future(self._loop, self._timeout)
         self._request_table[msgid] = future
         self._transport.send_message([message.REQUEST, msgid, method, args])
-
         return future
 
     def notify(self, method, *args):
@@ -67,11 +65,10 @@ def close(self):
         self._request_table = {}
 
     def on_connect_failed(self, reason):
-        """\
+        """
         The callback called when the connection failed.
         Called by the transport layer.
         """
-
         # set error for all requests
         #for msgid, future in self._request_table.iteritems():
         for msgid, future in _iteritems(self._request_table):
@@ -105,7 +102,7 @@ def on_timeout(self, msgid):
 
     def step_timeout(self):
         timeouts = []
-        for msgid, future in _iteritems(self._request_table):
+        for msgid, future in self._request_table.iteritems():
             if future.step_timeout():
                 timeouts.append(msgid)
 
@@ -118,20 +115,14 @@ def step_timeout(self):
             future.set_error("Request timed out")
         self._loop.start()
 
-def _iteritems(dic): # ugly!!!!!!
-    if inPy3k:
-        return dic.items()
-    else:
-        return dic.iteritems()
 
 def _NoSyncIDGenerator():
-    """\
+    """
     Message ID Generator.
 
     NOTE: Don't use in multithread. If you want use this
     in multithreaded application, use lock.
     """
-
     counter = 0
     while True:
         yield counter

setup.py

@@ -5,14 +5,14 @@
 import sys
 
 try:
-    from setuptools import setup, find_packages
+    from setuptools import setup
 except ImportError:
     setup = distutils.core.setup
     pass
 
 kwargs = {}
 major, minor = sys.version_info[:2]
-if major >= 3:
+if major == 3:
     import setuptools  # setuptools is required for use_2to3
     kwargs["use_2to3"] = True
 

test/helper.py

@@ -1,8 +1,6 @@
 import os
 import sys
 
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
 def unused_port():
     import socket
 

test/test_msgpackrpc.py

@@ -3,7 +3,6 @@
 
 import helper
 import msgpackrpc
-from msgpackrpc import inPy3k
 from msgpackrpc import error
 
 

tox.ini

@@ -0,0 +1,7 @@
+[tox]
+envlist = py27,py32
+[testenv]
+deps=
+    pytest
+    six
+commands=py.test test