Stop using deprecated imports.

web/pgadmin/tools/__init__.py

@@ -9,7 +9,7 @@
 
 """A blueprint module container for keeping all submodule of type tool."""
 
-from flask.ext.babel import gettext
+from flask_babel import gettext
 from pgadmin.utils import PgAdminModule
 from pgadmin.utils.ajax import bad_request
 

web/pgadmin/tools/backup/__init__.py

@@ -14,8 +14,8 @@ import os
 
 from flask import render_template, request, current_app, \
     url_for, Response
-from flask.ext.babel import gettext as _
-from flask.ext.security import login_required, current_user
+from flask_babel import gettext as _
+from flask_security import login_required, current_user
 from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc
 from pgadmin.utils import PgAdminModule, get_storage_directory, html
 from pgadmin.utils.ajax import make_json_response, bad_request

web/pgadmin/tools/datagrid/__init__.py

@@ -16,8 +16,8 @@ import random
 
 from flask import Response, url_for, session, request, make_response
 from flask import current_app as app
-from flask.ext.babel import gettext
-from flask.ext.security import login_required
+from flask_babel import gettext
+from flask_security import login_required
 from pgadmin.tools.sqleditor.command import *
 from pgadmin.utils import PgAdminModule
 from pgadmin.utils.ajax import make_json_response, bad_request, \

web/pgadmin/tools/debugger/__init__.py

@@ -15,8 +15,8 @@ import json
 import random
 
 from flask import url_for, Response, render_template, request, session, current_app
-from flask.ext.babel import gettext
-from flask.ext.security import login_required
+from flask_babel import gettext
+from flask_security import login_required
 from pgadmin.utils import PgAdminModule
 from pgadmin.utils.ajax import bad_request
 from pgadmin.utils.ajax import make_json_response, \

web/pgadmin/tools/grant_wizard/__init__.py

@@ -12,8 +12,8 @@
 import simplejson as json
 from flask import Response, url_for
 from flask import render_template, request, current_app
-from flask.ext.babel import gettext
-from flask.ext.security import login_required
+from flask_babel import gettext
+from flask_security import login_required
 from pgadmin.browser.server_groups.servers.utils import parse_priv_to_db
 from pgadmin.utils import PgAdminModule
 from pgadmin.utils.ajax import make_response as ajax_response, \

web/pgadmin/tools/import_export/__init__.py

@@ -13,8 +13,8 @@ import json
 import os
 
 from flask import url_for, Response, render_template, request, current_app
-from flask.ext.babel import gettext as _
-from flask.ext.security import login_required, current_user
+from flask_babel import gettext as _
+from flask_security import login_required, current_user
 from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc
 from pgadmin.utils import PgAdminModule, get_storage_directory, html
 from pgadmin.utils.ajax import make_json_response, bad_request

web/pgadmin/tools/maintenance/__init__.py

@@ -12,8 +12,8 @@
 import json
 
 from flask import url_for, Response, render_template, request, current_app
-from flask.ext.babel import gettext as _
-from flask.ext.security import login_required
+from flask_babel import gettext as _
+from flask_security import login_required
 from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc
 from pgadmin.utils import PgAdminModule, html
 from pgadmin.utils.ajax import bad_request, make_json_response

web/pgadmin/tools/restore/__init__.py

@@ -14,8 +14,8 @@ import os
 
 from flask import render_template, request, current_app, \
     url_for, Response
-from flask.ext.babel import gettext as _
-from flask.ext.security import login_required, current_user
+from flask_babel import gettext as _
+from flask_security import login_required, current_user
 from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc
 from pgadmin.utils import PgAdminModule, get_storage_directory, html
 from pgadmin.utils.ajax import make_json_response, bad_request

web/pgadmin/tools/sqleditor/__init__.py

@@ -16,8 +16,8 @@ import pickle
 import random
 
 from flask import Response, url_for, render_template, session, request
-from flask.ext.babel import gettext
-from flask.ext.security import login_required
+from flask_babel import gettext
+from flask_security import login_required
 from pgadmin.tools.sqleditor.command import QueryToolCommand
 from pgadmin.utils import PgAdminModule
 from pgadmin.utils import get_storage_directory

web/pgadmin/tools/sqleditor/command.py

@@ -13,7 +13,7 @@ from abc import ABCMeta, abstractmethod
 
 import six
 from flask import render_template
-from flask.ext.babel import gettext
+from flask_babel import gettext
 from pgadmin.utils.ajax import forbidden
 from pgadmin.utils.driver import get_driver
 

web/pgadmin/tools/user_management/__init__.py

@@ -14,9 +14,9 @@ import re
 
 from flask import render_template, request, \
     url_for, Response, abort
-from flask.ext.babel import gettext as _
-from flask.ext.security import login_required, roles_required, current_user
-from flask.ext.security.utils import encrypt_password
+from flask_babel import gettext as _
+from flask_security import login_required, roles_required, current_user
+from flask_security.utils import encrypt_password
 from pgadmin.utils import PgAdminModule
 from pgadmin.utils.ajax import make_response as ajax_response, \
     make_json_response, bad_request, internal_server_error