feat: upgrade to python3.6

requirements.txt

@@ -1,8 +1,7 @@
 flake8==3.2.1
 coveralls==1.1
-paho-mqtt==1.2.3
+paho-mqtt==1.4.0
 simplejson==3.10.0
 voluptuous==0.10.5
 nose==1.3.7
 mock==2.0.0
-six==1.10.0

sanji/connection/mqtt.py

@@ -101,7 +101,7 @@ def set_tunnels(self, tunnels):
         """
         set_tunnels(self, tunnels):
         """
-        for tunnel_type, (tunnel, callback) in tunnels.iteritems():
+        for tunnel_type, (tunnel, callback) in tunnels.items():
             if tunnel is None:
                 continue
             self.set_tunnel(tunnel_type, tunnel, callback)

sanji/message.py

@@ -1,8 +1,7 @@
-import simplejson as json
+import json
 import copy
 import os
 import random
-import six
 from random import randint
 
 try:
@@ -120,7 +119,10 @@ class Message(object):
     Message
     """
     def __init__(self, message, generate_id=False):
-        if isinstance(message, six.string_types):
+        if isinstance(message, bytes):
+            message = message.decode("utf-8")
+
+        if isinstance(message, str):
             try:
                 message = json.loads(message)
             except Exception:
@@ -131,7 +133,7 @@ def __init__(self, message, generate_id=False):
             raise TypeError("Message must be JSON string or Dict")
 
         # put all prop into object
-        for (prop, value) in message.iteritems():
+        for (prop, value) in message.items():
             setattr(self, prop, value)
 
         if generate_id is True:

sanji/router.py

@@ -126,7 +126,7 @@ def dispatch(self, message):
 
     def get_routes(self):
         routes = {}
-        for resource, route in self.routes.iteritems():
+        for resource, route in self.routes.items():
             routes.update({resource: route.get_methods()})
 
         return routes

setup.py

@@ -10,7 +10,7 @@ def read(*paths):
 
 setup(
     name="sanji",
-    version="1.0.2",
+    version="2.0.0",
     description="Sanji Framework SDK",
     long_description=read('README.rst'),
     url="https://github.com/Sanji-IO/sanji",
@@ -26,9 +26,8 @@ def read(*paths):
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ]
 )