Merge pull request #65 from azad-13/master

add python3 support and fix Rados.mon_command call for ceph pacific

Author: Crapworks

app/__init__.py

@@ -75,12 +75,18 @@ class UserConfig(dict):
 
     def _string_decode_hook(self, data):
         rv = {}
-        for key, value in data.iteritems():
+        for key, value in data.items():
+          try:
             if isinstance(key, unicode):
                 key = key.encode('utf-8')
             if isinstance(value, unicode):
                 value = value.encode('utf-8')
-            rv[key] = value
+          # unicode does not exist if python3 is used
+          # ignore and don't do encoding, it is not
+          # needed in python3
+          except NameError:
+            pass
+          rv[key] = value
         return rv
 
     def __init__(self):

app/base.py

@@ -11,7 +11,7 @@ class ApiResource(MethodView):
     def as_blueprint(cls, name=None):
         name = name or cls.endpoint
         bp = Blueprint(name, cls.__module__, url_prefix=cls.url_prefix)
-        for endpoint, options in cls.url_rules.iteritems():
+        for endpoint, options in cls.url_rules.items():
             url_rule = options.get('rule', '')
             defaults = options.get('defaults', {})
             bp.add_url_rule(url_rule, defaults=defaults, view_func=cls.as_view(endpoint))

app/dashboard/views.py

@@ -44,7 +44,7 @@ class CephClusterCommand(dict):
 
     def __init__(self, cluster, **kwargs):
         dict.__init__(self)
-        ret, buf, err = cluster.mon_command(json.dumps(kwargs), '', timeout=5)
+        ret, buf, err = cluster.mon_command(json.dumps(kwargs), b'', timeout=5)
         if ret != 0:
             self['err'] = err
         else:

app/graphite/views.py

@@ -7,7 +7,12 @@
 from flask import jsonify
 from flask import current_app
 
-from urllib2 import urlopen
+# import urlopen from urllib.request / Python3
+# and fallback to urlopen from urllib2 / Python2
+try:
+  from urllib.request import urlopen
+except ImportError:
+  from urllib2 import urlopen
 
 from app.base import ApiResource