First round of Python 3 compatibility fixes.

web/pgadmin/browser/__init__.py

@@ -16,10 +16,10 @@ from flask.ext.security import login_required
 from flask.ext.login import current_user
 from flask.ext.babel import gettext
 from flaskext.gravatar import Gravatar
+import six
 
 MODULE_NAME = 'browser'
 
-
 class BrowserModule(PgAdminModule):
 
     def get_own_stylesheets(self):
@@ -136,20 +136,18 @@ class BrowserModule(PgAdminModule):
 
         for module in self.submodules:
             scripts.extend(module.get_own_javascripts())
-
         return scripts
 
 
 blueprint = BrowserModule(MODULE_NAME, __name__)
 
-
+@six.add_metaclass(ABCMeta)
 class BrowserPluginModule(PgAdminModule):
     """
     Base class for browser submodules.
     """
 
     browser_url_prefix = blueprint.url_prefix + '/'
-    __metaclass__ = ABCMeta
 
     def __init__(self, import_name, **kwargs):
         kwargs.setdefault("url_prefix", self.node_path)
@@ -178,7 +176,6 @@ class BrowserPluginModule(PgAdminModule):
 
         for module in self.submodules:
             scripts.extend(module.get_own_javascripts())
-
         return scripts
 
     def generate_browser_node(
@@ -213,7 +210,6 @@ class BrowserPluginModule(PgAdminModule):
 
         for submodule in self.submodules:
             snippets.extend(submodule.csssnippets)
-
         return snippets
 
     @abstractmethod

web/pgadmin/browser/server_groups/__init__.py

@@ -21,7 +21,7 @@ from pgadmin.browser import BrowserPluginModule
 from pgadmin.utils.menu import MenuItem
 from pgadmin.settings.settings_model import db, ServerGroup
 from pgadmin.browser.utils import NodeView
-
+import six
 
 class ServerGroupModule(BrowserPluginModule):
 
@@ -55,13 +55,12 @@ class ServerGroupMenuItem(MenuItem):
         kwargs.setdefault("type", ServerGroupModule.NODE_TYPE)
         super(ServerGroupMenuItem, self).__init__(**kwargs)
 
-
+@six.add_metaclass(ABCMeta)
 class ServerGroupPluginModule(BrowserPluginModule):
     """
     Base class for server group plugins.
     """
 
-    __metaclass__ = ABCMeta
 
     @abstractmethod
     def get_nodes(self, *arg, **kwargs):
@@ -119,7 +118,7 @@ class ServerGroupView(NodeView):
                 user_id=current_user.id,
                 id=gid).first()
 
-        data = request.form if request.form else json.loads(request.data)
+        data = request.form if request.form else json.loads(request.data.decode())
 
         if servergroup is None:
             return make_json_response(
@@ -165,8 +164,7 @@ class ServerGroupView(NodeView):
                     )
 
     def create(self):
-        data = request.form if request.form else json.loads(request.data)
-
+        data = request.form if request.form else json.loads(request.data.decode())
         if data[u'name'] != '':
             try:
                 sg = ServerGroup(
@@ -177,7 +175,7 @@ class ServerGroupView(NodeView):
 
                 data[u'id'] = sg.id
                 data[u'name'] = sg.name
-
+                
                 return jsonify(
                         node=self.blueprint.generate_browser_node(
                             "%d" % (sg.id),

web/pgadmin/browser/server_groups/servers/__init__.py

@@ -22,7 +22,7 @@ import pgadmin.browser.server_groups as sg
 from pgadmin.utils.crypto import encrypt, decrypt
 from pgadmin.browser import BrowserPluginModule
 from config import PG_DEFAULT_DRIVER
-
+import six
 
 class ServerModule(sg.ServerGroupPluginModule):
     NODE_TYPE = "server"
@@ -90,13 +90,12 @@ class ServerMenuItem(MenuItem):
 
 blueprint = ServerModule(__name__)
 
-
+@six.add_metaclass(ABCMeta)
 class ServerTypeModule(BrowserPluginModule):
     """
     Base class for different server types.
     """
 
-    __metaclass__ = ABCMeta
 
     @abstractproperty
     def type(self):
@@ -381,7 +380,7 @@ class ServerNode(NodeView):
             u'role'
         ]
 
-        data = request.form if request.form else json.loads(request.data)
+        data = request.form if request.form else json.loads(request.data.decode())
 
         for arg in required_args:
             if arg not in data:
@@ -577,7 +576,10 @@ class ServerNode(NodeView):
             # TODO::
             # Ask the password again (if existing password couldn't be
             # descrypted)
-            return internal_server_error(errormsg=e.message)
+            if e.message:
+                return internal_server_error(errormsg=e.message)
+            else:
+                return internal_server_error(errormsg=str(e)) 
 
         if not status:
             current_app.logger.error(

web/pgadmin/browser/utils.py

@@ -14,16 +14,16 @@ from collections import OrderedDict
 import flask
 from flask.views import View, MethodViewType, with_metaclass
 from flask.ext.babel import gettext
+import six
 
 from config import PG_DEFAULT_DRIVER
 from pgadmin.browser import PgAdminModule
 from pgadmin.utils.ajax import make_json_response
 
-
+@six.add_metaclass(ABCMeta)
 class NodeAttr(object):
     """
     """
-    __metaclass__ = ABCMeta
 
     @abstractmethod
     def validate(self, mode, value):