diff --git a/web/pgadmin/__init__.py b/web/pgadmin/__init__.py index ed3f601..5caf604 100644 --- a/web/pgadmin/__init__.py +++ b/web/pgadmin/__init__.py @@ -16,7 +16,7 @@ from collections import defaultdict from importlib import import_module from flask import Flask, abort, request, current_app, session, url_for -from flask_babel import Babel, gettext +from flask_babelex import Babel, gettext from flask_login import user_logged_in, user_logged_out from flask_mail import Mail from flask_paranoid import Paranoid diff --git a/web/pgadmin/about/__init__.py b/web/pgadmin/about/__init__.py index 6d1e0b2..0e23f69 100644 --- a/web/pgadmin/about/__init__.py +++ b/web/pgadmin/about/__init__.py @@ -11,7 +11,7 @@ import sys from flask import Response, render_template, __version__, url_for -from flask_babel import gettext +from flask_babelex import gettext from flask_security import current_user, login_required from pgadmin.utils import PgAdminModule from pgadmin.utils.menu import MenuItem diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py index 57e8510..514b186 100644 --- a/web/pgadmin/browser/__init__.py +++ b/web/pgadmin/browser/__init__.py @@ -18,7 +18,7 @@ from socket import error as SOCKETErrorException import six from flask import current_app, render_template, url_for, make_response, \ flash, Response, request, after_this_request, redirect -from flask_babel import gettext +from flask_babelex import gettext from flask_gravatar import Gravatar from flask_login import current_user, login_required from flask_security.changeable import change_user_password diff --git a/web/pgadmin/browser/collection.py b/web/pgadmin/browser/collection.py index 52f0fe3..83bf284 100644 --- a/web/pgadmin/browser/collection.py +++ b/web/pgadmin/browser/collection.py @@ -11,7 +11,7 @@ from abc import ABCMeta, abstractmethod import six from flask import url_for, render_template -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser import BrowserPluginModule from pgadmin.browser.utils import PGChildModule from pgadmin.utils import PgAdminModule diff --git a/web/pgadmin/browser/server_groups/__init__.py b/web/pgadmin/browser/server_groups/__init__.py index 633d9ee..07632a7 100644 --- a/web/pgadmin/browser/server_groups/__init__.py +++ b/web/pgadmin/browser/server_groups/__init__.py @@ -14,7 +14,7 @@ from abc import ABCMeta, abstractmethod import six from flask import request, jsonify -from flask_babel import gettext +from flask_babelex import gettext from flask_security import current_user, login_required from pgadmin.browser import BrowserPluginModule from pgadmin.browser.utils import NodeView diff --git a/web/pgadmin/browser/server_groups/servers/__init__.py b/web/pgadmin/browser/server_groups/servers/__init__.py index 41eb429..01c72e5 100644 --- a/web/pgadmin/browser/server_groups/servers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/__init__.py @@ -12,7 +12,7 @@ import re import pgadmin.browser.server_groups as sg from flask import render_template, request, make_response, jsonify, \ current_app, url_for -from flask_babel import gettext +from flask_babelex import gettext from flask_security import current_user, login_required from pgadmin.browser.server_groups.servers.types import ServerType from pgadmin.browser.utils import PGChildNodeView diff --git a/web/pgadmin/browser/server_groups/servers/databases/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/__init__.py index dc465b0..f3471ef 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/__init__.py @@ -14,7 +14,7 @@ from functools import wraps import simplejson as json from flask import render_template, current_app, request, jsonify -from flask_babel import gettext as _ +from flask_babelex import gettext as _ import pgadmin.browser.server_groups.servers as servers from config import PG_DEFAULT_DRIVER diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py index 2ea178e..9ecf064 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py @@ -14,7 +14,7 @@ from functools import wraps import pgadmin.browser.server_groups.servers.databases as databases from flask import render_template, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, internal_server_error, \ diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py index 1fa8b26..0ad0687 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py @@ -13,7 +13,7 @@ from functools import wraps import pgadmin.browser.server_groups.servers.databases as database from flask import render_template, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, internal_server_error, \ diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py index abef0d2..1f85a3b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py @@ -14,7 +14,7 @@ from functools import wraps import pgadmin.browser.server_groups.servers.databases as databases from flask import render_template, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, \ diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py index c93a2fb..2fb553f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py @@ -14,7 +14,7 @@ from functools import wraps import pgadmin.browser.server_groups.servers.databases as databases from flask import render_template, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ parse_priv_to_db, validate_options, tokenize_options diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py index ee1325a..ad2501c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py @@ -14,7 +14,7 @@ from functools import wraps import pgadmin.browser.server_groups.servers.databases as databases from flask import render_template, make_response, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ parse_priv_to_db, validate_options, tokenize_options diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/__init__.py index 398351d..6455b36 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/__init__.py @@ -16,7 +16,7 @@ import pgadmin.browser.server_groups.servers as servers from pgadmin.browser.server_groups.servers.utils import \ validate_options, tokenize_options from flask import render_template, make_response, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, internal_server_error, \ diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py index 90acae3..3b77659 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py @@ -14,7 +14,7 @@ from functools import wraps import pgadmin.browser.server_groups.servers.databases as databases from flask import render_template, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ parse_priv_to_db diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py index 9a43b4d..e9ab634 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py @@ -12,7 +12,7 @@ from functools import wraps import simplejson as json from flask import render_template, request, jsonify, current_app -from flask_babel import gettext +from flask_babelex import gettext import pgadmin.browser.server_groups.servers as servers from config import PG_DEFAULT_DRIVER diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py index 6f2f352..26fed81 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py @@ -12,7 +12,7 @@ from functools import wraps from flask import render_template -from flask_babel import gettext +from flask_babelex import gettext import pgadmin.browser.server_groups.servers.databases as database from config import PG_DEFAULT_DRIVER diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py index e1b513f..c8219ae 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py @@ -12,7 +12,7 @@ from functools import wraps from flask import render_template -from flask_babel import gettext +from flask_babelex import gettext import pgadmin.browser.server_groups.servers.databases as database from config import PG_DEFAULT_DRIVER diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py index 947a053..ff89245 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py @@ -13,7 +13,7 @@ from functools import wraps import simplejson as json from flask import render_template, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext import pgadmin.browser.server_groups.servers.databases as database from config import PG_DEFAULT_DRIVER diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py index 73ad23e..17ae9ba 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py @@ -13,7 +13,7 @@ from functools import wraps import simplejson as json from flask import render_template, make_response, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext import pgadmin.browser.server_groups.servers.databases as databases from config import PG_DEFAULT_DRIVER diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py index 0d584c6..8c656c7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py @@ -13,7 +13,7 @@ from functools import wraps import simplejson as json from flask import render_template, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext import pgadmin.browser.server_groups.servers.databases.schemas.domains \ as domains diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py index a98ada7..32cb8cb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py @@ -16,7 +16,7 @@ from functools import wraps import simplejson as json from flask import render_template, make_response, request, jsonify, \ current_app -from flask_babel import gettext +from flask_babelex import gettext import pgadmin.browser.server_groups.servers.databases as databases from config import PG_DEFAULT_DRIVER diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py index 9c0db1d..ed1e936 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py @@ -13,7 +13,7 @@ from functools import wraps import simplejson as json from flask import render_template, make_response, current_app, request, jsonify -from flask_babel import gettext as _ +from flask_babelex import gettext as _ import pgadmin.browser.server_groups.servers.databases as databases from config import PG_DEFAULT_DRIVER diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py index b8796a9..7f0dc8e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py @@ -13,7 +13,7 @@ from functools import wraps import simplejson as json from flask import render_template, make_response, current_app, request, jsonify -from flask_babel import gettext as _ +from flask_babelex import gettext as _ import pgadmin.browser.server_groups.servers.databases as databases from config import PG_DEFAULT_DRIVER diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/__init__.py index 39bf243..88a5756 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/__init__.py @@ -13,7 +13,7 @@ from functools import wraps import simplejson as json from flask import render_template, request, jsonify, current_app -from flask_babel import gettext as _ +from flask_babelex import gettext as _ from config import PG_DEFAULT_DRIVER from pgadmin.browser.server_groups.servers.databases import DatabaseModule diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py index 7aa05e9..bf87f69 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py @@ -13,7 +13,7 @@ from functools import wraps import simplejson as json from flask import render_template, make_response, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext from config import PG_DEFAULT_DRIVER from pgadmin.browser.server_groups.servers.databases import DatabaseModule diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py index 506964b..d8e7a68 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py @@ -19,7 +19,7 @@ from functools import wraps import pgadmin.browser.server_groups.servers.databases as databases from flask import render_template, make_response, request, jsonify, \ current_app -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.server_groups.servers.databases.schemas.utils import \ SchemaChildModule, DataTypeReader from pgadmin.browser.server_groups.servers.databases.utils import \ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py index c8a9a5a..9aa5c9b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py @@ -13,7 +13,7 @@ from functools import wraps import simplejson as json from flask import render_template, make_response, request, jsonify -from flask_babel import gettext as _ +from flask_babelex import gettext as _ import pgadmin.browser.server_groups.servers.databases as database from config import PG_DEFAULT_DRIVER diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py index 3b7e0be..b1b7521 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py @@ -14,7 +14,7 @@ import re from functools import wraps from flask import render_template, make_response -from flask_babel import gettext +from flask_babelex import gettext import pgadmin.browser.server_groups.servers.databases\ .schemas.packages as packages diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/__init__.py index 8758123..6389919 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/__init__.py @@ -12,7 +12,7 @@ from functools import wraps from flask import render_template, make_response -from flask_babel import gettext +from flask_babelex import gettext import pgadmin.browser.server_groups.servers.databases.schemas \ .packages as packages diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py index f49c2d7..a41dd6d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py @@ -13,7 +13,7 @@ import simplejson as json from functools import wraps import pgadmin.browser.server_groups.servers.databases as database from flask import render_template, make_response, request, jsonify -from flask_babel import gettext as _ +from flask_babelex import gettext as _ from pgadmin.browser.server_groups.servers.databases.schemas.utils \ import SchemaChildModule from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py index 94062de..e57ae57 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py @@ -14,7 +14,7 @@ from functools import wraps import pgadmin.browser.server_groups.servers.databases as database from flask import render_template, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.server_groups.servers.databases.schemas.utils \ import SchemaChildModule from pgadmin.browser.utils import PGChildNodeView diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py index 1160cfb..d49ca20 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py @@ -14,7 +14,7 @@ import re import pgadmin.browser.server_groups.servers.databases as database from flask import render_template, request, jsonify, url_for -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.server_groups.servers.databases.schemas.utils \ import SchemaChildModule, DataTypeReader, VacuumSettings from pgadmin.browser.server_groups.servers.utils import parse_priv_to_db diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/__init__.py index 2b1ac92..83d30df 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/__init__.py @@ -14,7 +14,7 @@ from functools import wraps import pgadmin.browser.server_groups.servers.databases as database from flask import render_template, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.server_groups.servers.databases.schemas.utils \ import DataTypeReader diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py index 3b96c9b..4e34b43 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py @@ -13,7 +13,7 @@ from functools import wraps from pgadmin.utils.driver import get_driver import pgadmin.browser.server_groups.servers.databases as database from flask import render_template, make_response -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response, internal_server_error diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py index b993863..0de9b74 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py @@ -14,7 +14,7 @@ from functools import wraps import pgadmin.browser.server_groups.servers.databases as database from flask import render_template, make_response, request, jsonify -from flask_babel import gettext as _ +from flask_babelex import gettext as _ from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.server_groups.servers.databases.schemas.tables.\ constraints.type import ConstraintRegistry diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py index c35ce6e..74d1693 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py @@ -14,7 +14,7 @@ from functools import wraps import pgadmin.browser.server_groups.servers.databases as database from flask import render_template, make_response, request, jsonify -from flask_babel import gettext as _ +from flask_babelex import gettext as _ from pgadmin.browser.server_groups.servers.databases.schemas.tables.\ constraints.type import ConstraintRegistry, ConstraintTypeModule from pgadmin.browser.utils import PGChildNodeView diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py index ff37791..36f4eb0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py @@ -14,7 +14,7 @@ from functools import wraps import pgadmin.browser.server_groups.servers.databases as database from flask import render_template, make_response, request, jsonify -from flask_babel import gettext as _ +from flask_babelex import gettext as _ from pgadmin.browser.server_groups.servers.databases.schemas.tables.\ constraints.type import ConstraintRegistry, ConstraintTypeModule from pgadmin.browser.utils import PGChildNodeView diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py index 33c2f00..cdeef40 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py @@ -14,7 +14,7 @@ from functools import wraps import pgadmin.browser.server_groups.servers.databases as database from flask import render_template, make_response, request, jsonify -from flask_babel import gettext as _ +from flask_babelex import gettext as _ from pgadmin.browser.server_groups.servers.databases.schemas.tables.\ constraints.type import ConstraintRegistry, ConstraintTypeModule from pgadmin.browser.utils import PGChildNodeView diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py index 96fa1f3..44a020c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py @@ -14,7 +14,7 @@ from functools import wraps import pgadmin.browser.server_groups.servers.databases as database from flask import render_template, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.server_groups.servers.databases.schemas.tables.\ partitions import backend_supported diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py index 99e3529..df19573 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py @@ -13,7 +13,7 @@ import re import simplejson as json import pgadmin.browser.server_groups.servers.databases.schemas as schema from flask import render_template, request -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.server_groups.servers.databases.schemas.utils \ import DataTypeReader, VacuumSettings from pgadmin.utils.ajax import internal_server_error, \ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py index 8d31fde..ed03cc4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py @@ -14,7 +14,7 @@ from functools import wraps import pgadmin.browser.server_groups.servers.databases.schemas as schemas from flask import render_template, make_response, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.server_groups.servers.databases.schemas.utils import \ parse_rule_definition diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py index bfc8c47..5958474 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py @@ -14,7 +14,7 @@ from functools import wraps import pgadmin.browser.server_groups.servers.databases as database from flask import render_template, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, internal_server_error, \ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py index 45403d1..732ff55 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py @@ -13,7 +13,7 @@ import re from functools import wraps import simplejson as json from flask import render_template, jsonify, request -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.utils.ajax import make_json_response, internal_server_error, \ make_response as ajax_response from pgadmin.browser.server_groups.servers.databases.schemas.utils \ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py index 2395439..f142c1a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py @@ -13,7 +13,7 @@ from functools import wraps import simplejson as json from flask import render_template, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext import pgadmin.browser.server_groups.servers.databases as database from config import PG_DEFAULT_DRIVER diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py index 15b9559..4787d76 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py @@ -13,7 +13,7 @@ from functools import wraps import simplejson as json from flask import render_template, request, jsonify, current_app -from flask_babel import gettext +from flask_babelex import gettext import pgadmin.browser.server_groups.servers.databases as databases from config import PG_DEFAULT_DRIVER diff --git a/web/pgadmin/browser/server_groups/servers/gpdb.py b/web/pgadmin/browser/server_groups/servers/gpdb.py index 260e314..83ca4d8 100644 --- a/web/pgadmin/browser/server_groups/servers/gpdb.py +++ b/web/pgadmin/browser/server_groups/servers/gpdb.py @@ -7,7 +7,7 @@ # ########################################################################## -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.server_groups.servers.types import ServerType diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/__init__.py b/web/pgadmin/browser/server_groups/servers/pgagent/__init__.py index 29c2b88..bdfca2d 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/__init__.py @@ -12,7 +12,7 @@ from functools import wraps import json from flask import render_template, request, jsonify -from flask_babel import gettext as _ +from flask_babelex import gettext as _ from config import PG_DEFAULT_DRIVER diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/__init__.py b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/__init__.py index 80aa3e1..2fdf100 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/__init__.py @@ -13,7 +13,7 @@ import json from functools import wraps from flask import render_template, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, gone, \ diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/steps/__init__.py b/web/pgadmin/browser/server_groups/servers/pgagent/steps/__init__.py index c12f524..cb39713 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/steps/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/steps/__init__.py @@ -13,7 +13,7 @@ import json from functools import wraps from flask import render_template, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, gone, \ diff --git a/web/pgadmin/browser/server_groups/servers/ppas.py b/web/pgadmin/browser/server_groups/servers/ppas.py index 0fc456e..a6c596e 100644 --- a/web/pgadmin/browser/server_groups/servers/ppas.py +++ b/web/pgadmin/browser/server_groups/servers/ppas.py @@ -7,7 +7,7 @@ # ########################################################################## -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.server_groups.servers.types import ServerType diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py b/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py index a9b622d..8a531a8 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py @@ -14,7 +14,7 @@ from functools import wraps import pgadmin.browser.server_groups.servers as servers from flask import render_template, make_response, request, jsonify -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.utils import NodeView from pgadmin.utils.ajax import make_json_response, \ diff --git a/web/pgadmin/browser/server_groups/servers/roles/__init__.py b/web/pgadmin/browser/server_groups/servers/roles/__init__.py index ed86476..63d1bf7 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/roles/__init__.py @@ -12,7 +12,7 @@ from functools import wraps import pgadmin.browser.server_groups as sg import simplejson as json from flask import render_template, request, jsonify, current_app -from flask_babel import gettext as _ +from flask_babelex import gettext as _ import dateutil.parser as dateutil_parser from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.utils import PGChildNodeView diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py b/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py index 941c645..c54ffa9 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py @@ -12,7 +12,7 @@ from functools import wraps import pgadmin.browser.server_groups.servers as servers from flask import render_template, make_response, request, jsonify, current_app -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ parse_priv_to_db diff --git a/web/pgadmin/browser/server_groups/servers/types.py b/web/pgadmin/browser/server_groups/servers/types.py index 83ae029..d0bea4f 100644 --- a/web/pgadmin/browser/server_groups/servers/types.py +++ b/web/pgadmin/browser/server_groups/servers/types.py @@ -11,7 +11,7 @@ import os import sys from flask import render_template -from flask_babel import gettext as _ +from flask_babelex import gettext as _ from pgadmin.utils.preferences import Preferences import config diff --git a/web/pgadmin/browser/utils.py b/web/pgadmin/browser/utils.py index df6758d..00a72dd 100644 --- a/web/pgadmin/browser/utils.py +++ b/web/pgadmin/browser/utils.py @@ -14,7 +14,7 @@ from abc import abstractmethod import flask from flask import render_template, current_app from flask.views import View, MethodViewType, with_metaclass -from flask_babel import gettext +from flask_babelex import gettext from config import PG_DEFAULT_DRIVER from pgadmin.utils.ajax import make_json_response, precondition_required diff --git a/web/pgadmin/dashboard/__init__.py b/web/pgadmin/dashboard/__init__.py index 7666cb5..91162f7 100644 --- a/web/pgadmin/dashboard/__init__.py +++ b/web/pgadmin/dashboard/__init__.py @@ -10,7 +10,7 @@ """A blueprint module implementing the dashboard frame.""" from functools import wraps from flask import render_template, url_for, Response, g -from flask_babel import gettext +from flask_babelex import gettext from flask_security import login_required from pgadmin.utils import PgAdminModule from pgadmin.utils.ajax import make_response as ajax_response,\ diff --git a/web/pgadmin/help/__init__.py b/web/pgadmin/help/__init__.py index e3b0194..dbdb421 100644 --- a/web/pgadmin/help/__init__.py +++ b/web/pgadmin/help/__init__.py @@ -9,7 +9,7 @@ """A blueprint module implementing the pgAdmin help system.""" from flask import url_for -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.utils import PgAdminModule from pgadmin.utils.menu import MenuItem, Panel from pgadmin.utils.preferences import Preferences diff --git a/web/pgadmin/misc/__init__.py b/web/pgadmin/misc/__init__.py index 19e1828..da28413 100644 --- a/web/pgadmin/misc/__init__.py +++ b/web/pgadmin/misc/__init__.py @@ -11,7 +11,7 @@ import pgadmin.utils.driver as driver from flask import url_for, render_template, Response, request -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.utils import PgAdminModule from pgadmin.utils.preferences import Preferences diff --git a/web/pgadmin/misc/bgprocess/processes.py b/web/pgadmin/misc/bgprocess/processes.py index 9737f46..44b3362 100644 --- a/web/pgadmin/misc/bgprocess/processes.py +++ b/web/pgadmin/misc/bgprocess/processes.py @@ -25,7 +25,7 @@ from pgadmin.utils import IS_PY2, u, file_quote, fs_encoding, \ import pytz from dateutil import parser from flask import current_app -from flask_babel import gettext as _ +from flask_babelex import gettext as _ from flask_security import current_user import config diff --git a/web/pgadmin/misc/file_manager/__init__.py b/web/pgadmin/misc/file_manager/__init__.py index b9be488..32afb5e 100644 --- a/web/pgadmin/misc/file_manager/__init__.py +++ b/web/pgadmin/misc/file_manager/__init__.py @@ -22,7 +22,7 @@ import codecs import simplejson as json from flask import render_template, Response, session, request as req, \ url_for, current_app -from flask_babel import gettext +from flask_babelex import gettext from flask_security import login_required from pgadmin.utils import PgAdminModule from pgadmin.utils import get_storage_directory diff --git a/web/pgadmin/preferences/__init__.py b/web/pgadmin/preferences/__init__.py index 6358841..f27c527 100644 --- a/web/pgadmin/preferences/__init__.py +++ b/web/pgadmin/preferences/__init__.py @@ -15,7 +15,7 @@ side and for getting/setting preferences. import config import simplejson as json from flask import render_template, url_for, Response, request, session -from flask_babel import gettext +from flask_babelex import gettext from flask_security import login_required from pgadmin.utils import PgAdminModule from pgadmin.utils.ajax import success_return, \ diff --git a/web/pgadmin/settings/__init__.py b/web/pgadmin/settings/__init__.py index a2a84c6..269bfdf 100644 --- a/web/pgadmin/settings/__init__.py +++ b/web/pgadmin/settings/__init__.py @@ -12,7 +12,7 @@ import traceback from flask import Response, request, render_template, url_for -from flask_babel import gettext +from flask_babelex import gettext from flask_login import current_user from flask_security import login_required from pgadmin.utils import PgAdminModule diff --git a/web/pgadmin/tools/__init__.py b/web/pgadmin/tools/__init__.py index 200d16e..2c32417 100644 --- a/web/pgadmin/tools/__init__.py +++ b/web/pgadmin/tools/__init__.py @@ -11,7 +11,7 @@ from flask import render_template, Response from flask import url_for -from flask_babel import get_translations, gettext +from flask_babelex import Domain, gettext from pgadmin.utils import PgAdminModule from pgadmin.utils.ajax import bad_request @@ -64,9 +64,11 @@ def translations(): """Return a js file that will handle translations so Flask interpolation can be isolated """ + domain = Domain() + translations = domain.get_translations() template = render_template( "js/translations.js", - translations=get_translations()._catalog + translations=translations._catalog ) return Response( response=template, diff --git a/web/pgadmin/tools/backup/__init__.py b/web/pgadmin/tools/backup/__init__.py index 8936e53..8f0589b 100644 --- a/web/pgadmin/tools/backup/__init__.py +++ b/web/pgadmin/tools/backup/__init__.py @@ -15,7 +15,7 @@ import os from flask import render_template, request, current_app, \ url_for, Response -from flask_babel import gettext as _ +from flask_babelex 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, \ diff --git a/web/pgadmin/tools/debugger/__init__.py b/web/pgadmin/tools/debugger/__init__.py index ca6e6d4..c0e89f5 100644 --- a/web/pgadmin/tools/debugger/__init__.py +++ b/web/pgadmin/tools/debugger/__init__.py @@ -16,7 +16,7 @@ import random from flask import url_for, Response, render_template, request, session, \ current_app -from flask_babel import gettext +from flask_babelex import gettext from flask_security import login_required from werkzeug.useragents import UserAgent diff --git a/web/pgadmin/tools/grant_wizard/__init__.py b/web/pgadmin/tools/grant_wizard/__init__.py index c092d49..e695d7b 100644 --- a/web/pgadmin/tools/grant_wizard/__init__.py +++ b/web/pgadmin/tools/grant_wizard/__init__.py @@ -12,7 +12,7 @@ import simplejson as json from flask import Response, url_for from flask import render_template, request, current_app -from flask_babel import gettext +from flask_babelex 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 diff --git a/web/pgadmin/tools/import_export/__init__.py b/web/pgadmin/tools/import_export/__init__.py index 9690475..9160a8e 100644 --- a/web/pgadmin/tools/import_export/__init__.py +++ b/web/pgadmin/tools/import_export/__init__.py @@ -13,7 +13,7 @@ import simplejson as json import os from flask import url_for, Response, render_template, request, current_app -from flask_babel import gettext as _ +from flask_babelex 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, \ diff --git a/web/pgadmin/tools/maintenance/__init__.py b/web/pgadmin/tools/maintenance/__init__.py index 088922b..5a596a7 100644 --- a/web/pgadmin/tools/maintenance/__init__.py +++ b/web/pgadmin/tools/maintenance/__init__.py @@ -12,7 +12,7 @@ import simplejson as json from flask import url_for, Response, render_template, request, current_app -from flask_babel import gettext as _ +from flask_babelex import gettext as _ from flask_security import login_required from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc from pgadmin.utils import PgAdminModule, html diff --git a/web/pgadmin/tools/restore/__init__.py b/web/pgadmin/tools/restore/__init__.py index db1d522..f6f92b9 100644 --- a/web/pgadmin/tools/restore/__init__.py +++ b/web/pgadmin/tools/restore/__init__.py @@ -14,7 +14,7 @@ import os from flask import render_template, request, current_app, \ url_for, Response -from flask_babel import gettext as _ +from flask_babelex 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, \ diff --git a/web/pgadmin/tools/sqleditor/__init__.py b/web/pgadmin/tools/sqleditor/__init__.py index 6f5d5b7..f8d7d97 100644 --- a/web/pgadmin/tools/sqleditor/__init__.py +++ b/web/pgadmin/tools/sqleditor/__init__.py @@ -16,7 +16,7 @@ import random import simplejson as json from flask import Response, url_for, render_template, session, request, \ current_app -from flask_babel import gettext +from flask_babelex import gettext from flask_security import login_required from config import PG_DEFAULT_DRIVER, ON_DEMAND_RECORD_COUNT diff --git a/web/pgadmin/tools/sqleditor/command.py b/web/pgadmin/tools/sqleditor/command.py index 8cc96e0..7ec03c5 100644 --- a/web/pgadmin/tools/sqleditor/command.py +++ b/web/pgadmin/tools/sqleditor/command.py @@ -16,7 +16,7 @@ except ImportError: from ordereddict import OrderedDict import six from flask import render_template -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.utils.ajax import forbidden from pgadmin.utils.driver import get_driver diff --git a/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py b/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py index 6050a0b..7c43d9b 100644 --- a/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py +++ b/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py @@ -8,7 +8,7 @@ ########################################################################## """Register preferences for query tool""" -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.utils import SHORTCUT_FIELDS as shortcut_fields, \ ACCESSKEY_FIELDS as accesskey_fields from pgadmin.utils.preferences import Preferences diff --git a/web/pgadmin/tools/sqleditor/utils/start_running_query.py b/web/pgadmin/tools/sqleditor/utils/start_running_query.py index 3b3c502..6c09067 100644 --- a/web/pgadmin/tools/sqleditor/utils/start_running_query.py +++ b/web/pgadmin/tools/sqleditor/utils/start_running_query.py @@ -13,7 +13,7 @@ import pickle import random from flask import Response -from flask_babel import gettext +from flask_babelex import gettext from config import PG_DEFAULT_DRIVER from pgadmin.tools.sqleditor.utils.apply_explain_plan_wrapper import \ diff --git a/web/pgadmin/tools/user_management/__init__.py b/web/pgadmin/tools/user_management/__init__.py index 89e36c7..ac6e2f4 100644 --- a/web/pgadmin/tools/user_management/__init__.py +++ b/web/pgadmin/tools/user_management/__init__.py @@ -14,7 +14,7 @@ import re from flask import render_template, request, \ url_for, Response, abort, current_app -from flask_babel import gettext as _ +from flask_babelex import gettext as _ from flask_security import login_required, roles_required, current_user from flask_security.utils import encrypt_password diff --git a/web/pgadmin/utils/__init__.py b/web/pgadmin/utils/__init__.py index c87a045..54a599c 100644 --- a/web/pgadmin/utils/__init__.py +++ b/web/pgadmin/utils/__init__.py @@ -13,7 +13,7 @@ from collections import defaultdict from operator import attrgetter from flask import Blueprint, current_app -from flask_babel import gettext +from flask_babelex import gettext from .paths import get_storage_directory from .preferences import Preferences diff --git a/web/pgadmin/utils/ajax.py b/web/pgadmin/utils/ajax.py index 182e490..9b44aa3 100644 --- a/web/pgadmin/utils/ajax.py +++ b/web/pgadmin/utils/ajax.py @@ -14,7 +14,7 @@ import decimal import simplejson as json from flask import Response -from flask_babel import gettext as _ +from flask_babelex import gettext as _ class DataTypeJSONEncoder(json.JSONEncoder): diff --git a/web/pgadmin/utils/crypto.py b/web/pgadmin/utils/crypto.py index 07833d4..def3d68 100644 --- a/web/pgadmin/utils/crypto.py +++ b/web/pgadmin/utils/crypto.py @@ -28,11 +28,11 @@ def encrypt(plaintext, key): """ iv = Random.new().read(AES.block_size) - cipher = AES.new(pad(key), AES.MODE_CFB, iv) + key = pad(key).encode('utf-8') + cipher = AES.new(key, AES.MODE_CFB, iv) # If user has entered non ascii password (Python2) # we have to encode it first - if hasattr(str, 'decode'): - plaintext = plaintext.encode('utf-8') + plaintext = plaintext.encode('utf-8') encrypted = base64.b64encode(iv + cipher.encrypt(plaintext)) return encrypted @@ -51,32 +51,33 @@ def decrypt(ciphertext, key): ciphertext = base64.b64decode(ciphertext) iv = ciphertext[:AES.block_size] - cipher = AES.new(pad(key), AES.MODE_CFB, iv) + key = pad(key).encode('utf-8') + cipher = AES.new(key, AES.MODE_CFB, iv) decrypted = cipher.decrypt(ciphertext[AES.block_size:]) return decrypted -def pad(str): +def pad(key): """Add padding to the key.""" global padding_string - str_len = len(str) + str_len = len(key) # Key must be maximum 32 bytes long, so take first 32 bytes if str_len > 32: - return str[:32] + return key[:32] # If key size id 16, 24 or 32 bytes then padding not require if str_len == 16 or str_len == 24 or str_len == 32: - return str + return key # Convert bytes to string (python3) if not hasattr(str, 'decode'): padding_string = padding_string.decode() # Add padding to make key 32 bytes long - return str + ((32 - len(str) % 32) * padding_string) + return key + ((32 - str_len % 32) * padding_string) def pqencryptpassword(password, user): diff --git a/web/pgadmin/utils/driver/psycopg2/__init__.py b/web/pgadmin/utils/driver/psycopg2/__init__.py index 95a49fb..5fefdee 100644 --- a/web/pgadmin/utils/driver/psycopg2/__init__.py +++ b/web/pgadmin/utils/driver/psycopg2/__init__.py @@ -15,7 +15,7 @@ object. """ import datetime from flask import session -from flask_babel import gettext +from flask_babelex import gettext import psycopg2 from psycopg2.extensions import adapt diff --git a/web/pgadmin/utils/driver/psycopg2/connection.py b/web/pgadmin/utils/driver/psycopg2/connection.py index 49dcf98..8a05ba8 100644 --- a/web/pgadmin/utils/driver/psycopg2/connection.py +++ b/web/pgadmin/utils/driver/psycopg2/connection.py @@ -20,7 +20,7 @@ from collections import deque import simplejson as json import psycopg2 from flask import g, current_app -from flask_babel import gettext +from flask_babelex import gettext from flask_security import current_user from pgadmin.utils.crypto import decrypt from psycopg2.extensions import adapt, encodings diff --git a/web/pgadmin/utils/driver/psycopg2/server_manager.py b/web/pgadmin/utils/driver/psycopg2/server_manager.py index f288a94..3066b1a 100644 --- a/web/pgadmin/utils/driver/psycopg2/server_manager.py +++ b/web/pgadmin/utils/driver/psycopg2/server_manager.py @@ -14,7 +14,7 @@ import os import datetime from flask import current_app, session from flask_security import current_user -from flask_babel import gettext +from flask_babelex import gettext from pgadmin.utils.crypto import decrypt from .connection import Connection diff --git a/web/pgadmin/utils/driver/registry.py b/web/pgadmin/utils/driver/registry.py index 8da6c0a..348ad7f 100644 --- a/web/pgadmin/utils/driver/registry.py +++ b/web/pgadmin/utils/driver/registry.py @@ -9,7 +9,7 @@ from abc import ABCMeta -from flask_babel import gettext +from flask_babelex import gettext def _decorate_cls_name(module_name): diff --git a/web/pgadmin/utils/exception.py b/web/pgadmin/utils/exception.py index f010d35..5fe2e92 100644 --- a/web/pgadmin/utils/exception.py +++ b/web/pgadmin/utils/exception.py @@ -9,7 +9,7 @@ from werkzeug.exceptions import HTTPException from werkzeug.http import HTTP_STATUS_CODES -from flask_babel import gettext as _ +from flask_babelex import gettext as _ from flask import request from pgadmin.utils.ajax import service_unavailable diff --git a/web/pgadmin/utils/preferences.py b/web/pgadmin/utils/preferences.py index c1fadd7..6e8e00e 100644 --- a/web/pgadmin/utils/preferences.py +++ b/web/pgadmin/utils/preferences.py @@ -17,7 +17,7 @@ import simplejson as json import dateutil.parser as dateutil_parser from flask import current_app -from flask_babel import gettext +from flask_babelex import gettext from flask_security import current_user from pgadmin.model import db, Preferences as PrefTable, \