Remove 2to3 dependency.

Author: methane

msgpackrpc/__init__.py

@@ -1,4 +1,4 @@
-from _version import __version__
+from ._version import __version__
 
 # shortcut for most-used symbols
 from msgpackrpc.loop import Loop

msgpackrpc/compat.py

@@ -6,6 +6,12 @@ def force_str(s):
         if isinstance(s, bytes):
             return s.decode('utf-8')
         return str(s)
+
+    def iteritems(d):
+        return d.items()
 else:
     def force_str(s):
         return str(s)
+
+    def iteritems(d):
+        return d.iteritems()

msgpackrpc/session.py

@@ -5,6 +5,7 @@
 from msgpackrpc.error import RPCError
 from msgpackrpc.future import Future
 from msgpackrpc.transport import tcp
+from msgpackrpc.compat import iteritems
 
 
 class Session(object):
@@ -70,8 +71,7 @@ def on_connect_failed(self, reason):
         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):
+        for msgid, future in iteritems(self._request_table):
             future.set_error(reason)
 
         self._request_table = {}
@@ -102,7 +102,7 @@ def on_timeout(self, msgid):
 
     def step_timeout(self):
         timeouts = []
-        for msgid, future in self._request_table.iteritems():
+        for msgid, future in iteritems(self._request_table):
             if future.step_timeout():
                 timeouts.append(msgid)
 

setup.py

@@ -1,23 +1,14 @@
 #!/usr/bin/env python
 # coding: utf-8
 
-import distutils.core
-import sys
-
-# Avoid importing msgpackrpc to make sdist without installing
-# requiring packages.
+# Define __version__ without importing msgpackrpc.
+# This allows building sdist without installing any 3rd party packages.
 exec(open('msgpackrpc/_version.py').read())
 
 try:
     from setuptools import setup
 except ImportError:
-    setup = distutils.core.setup
-
-kwargs = {}
-major, minor = sys.version_info[:2]
-if major == 3:
-    import setuptools  # setuptools is required for use_2to3
-    kwargs["use_2to3"] = True
+    from distutils.core import setup
 
 setup(name='msgpack-rpc-python',
       version=__version__,
@@ -37,5 +28,4 @@
           'Programming Language :: Python :: 2',
           'Programming Language :: Python :: 3',
           'License :: OSI Approved :: Apache Software License'],
-      **kwargs
       )