IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2026-07-29 15:53:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update Python and JS modules. Fixes #3154

Browse Source
This commit is contained in:
Murtuza Zabuawala
2018-04-04 10:47:01 +01:00
committed by Dave Page
parent fc886cf8bb
commit be055ce57d
88 changed files with 182 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/pip/setup_pip.py
+8 -3
View File
@@ -87,10 +87,15 @@ setup(
extras_require={ extras_require={
# ... # ...
":python_version<'2.7'": [ ":python_version<'2.7'": [
"ordereddict", "Flask-Script", "psycopg2==2.7.3.2" "ordereddict", "Flask-Script",
"psycopg2==2.7.3.2", "pycrypto==2.6.1"
], ],
":python_version<='2.7'": ["backports.csv", "importlib"], ":python_version<='2.7'": [
":python_version>='2.7'": ["Flask-HTMLmin", "psycopg2>=2.7.3.2"] "backports.csv", "importlib"
],
":python_version>='2.7'": [
"Flask-HTMLmin", "psycopg2>=2.7.3.2", "pycryptodome"
]
}, },
# Specify data files to be included. For Python 2.6 include them in MANIFEST.in # Specify data files to be included. For Python 2.6 include them in MANIFEST.in
requirements.txt
+27 -34
View File
@@ -1,46 +1,39 @@
# NOTE: Any requirements with environment specifiers must be explicitly added # NOTE: Any requirements with environment specifiers must be explicitly added
# to pkg/pip/setup_pip.py (in extras_require), otherwise they will be # to pkg/pip/setup_pip.py (in extras_require), otherwise they will be
# ignored when building a PIP Wheel. # ignored when building a PIP Wheel.
Babel==2.3.4 blinker==1.4
beautifulsoup4==4.4.1 extras==1.0.0
blinker==1.3 fixtures==3.0.0
click==6.6 Flask==0.12.2
extras==0.0.3 Flask-Gravatar==0.5.0
fixtures==2.0.0 Flask-HTMLmin==1.3.2; python_version >= '2.7'
Flask==0.11.1
Flask-Babel==0.11.1
Flask-Gravatar==0.4.2
Flask-HTMLmin==1.2; python_version >= '2.7'
Flask-Login==0.3.2 Flask-Login==0.3.2
Flask-Mail==0.9.1 Flask-Mail==0.9.1
Flask-Migrate==2.0.3 Flask-Migrate==2.1.1
Flask-Principal==0.4.0 Flask-Principal==0.4.0
Flask-Security==1.7.5 Flask-Security==3.0.0
Flask-SQLAlchemy==2.1 Flask-SQLAlchemy==2.3.2
Flask-WTF==0.12 Flask-WTF==0.14.2
html5lib==1.0b3 html5lib==1.0.1
importlib==1.0.3; python_version <= '2.7' importlib==1.0.3; python_version <= '2.7'
itsdangerous==0.24
Jinja2==2.7.3
linecache2==1.0.0 linecache2==1.0.0
MarkupSafe==0.23
ordereddict; python_version < '2.7' ordereddict; python_version < '2.7'
passlib==1.6.2 passlib==1.7.1
pbr==1.9.1 pbr==3.1.1
psycopg2>=2.7.3.2; python_version >= '2.7' psycopg2>=2.7.4; python_version >= '2.7'
psycopg2==2.7.3.2; python_version < '2.7' psycopg2==2.7.3.2; python_version < '2.7'
pycrypto==2.6.1 pycrypto==2.6.1; python_version < '2.7'
pyrsistent==0.11.13 pycryptodome; python_version >= '2.7'
python-dateutil==2.5.0 pyrsistent==0.14.2
python-mimeparse==1.5.1 python-dateutil==2.7.1
pytz==2014.10 python-mimeparse==1.6.0
simplejson==3.6.5 pytz==2018.3
six>=1.9.0 simplejson==3.13.2
six>=1.11.0
speaklater==1.3 speaklater==1.3
SQLAlchemy==1.0.14 SQLAlchemy==1.2.5
sqlparse==0.1.19 sqlparse==0.2.4
Werkzeug==0.9.6 WTForms==2.1
WTForms==2.0.2 backports.csv==1.0.5; python_version <= '2.7'
backports.csv==1.0.4; python_version <= '2.7' Flask-Paranoid==0.2.0
Flask-Paranoid==0.1.0
Flask-Script==2.0.5; python_version < '2.7' Flask-Script==2.0.5; python_version < '2.7'
web/package.json
+9 -9
View File
@@ -1,7 +1,7 @@
{ {
"license": "PostgreSQL", "license": "PostgreSQL",
"devDependencies": { "devDependencies": {
"axios-mock-adapter": "^1.11.0", "axios-mock-adapter": "^1.14.1",
"babel-core": "~6.24.0", "babel-core": "~6.24.0",
"babel-loader": "~7.1.2", "babel-loader": "~7.1.2",
"babel-preset-airbnb": "^2.4.0", "babel-preset-airbnb": "^2.4.0",
@@ -40,21 +40,21 @@
"dependencies": { "dependencies": {
"acitree": "git+https://github.com/imsurinder90/jquery-aciTree.git#rc.7", "acitree": "git+https://github.com/imsurinder90/jquery-aciTree.git#rc.7",
"alertifyjs": "^1.10.0", "alertifyjs": "^1.10.0",
"axios": "^0.16.1", "axios": "^0.18.0",
"babel-plugin-transform-es2015-modules-amd": "^6.24.1", "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
"babel-polyfill": "^6.23.0", "babel-polyfill": "^6.23.0",
"babel-preset-es2015-without-strict": "~0.0.4", "babel-preset-es2015-without-strict": "~0.0.4",
"babelify": "~7.3.0", "babelify": "~7.3.0",
"backbone": "1.1.2", "backbone": "1.3.3",
"backform": "^0.2.0", "backform": "^0.2.0",
"backgrid": "^0.3.8", "backgrid": "^0.3.8",
"backgrid-filter": "^0.3.7", "backgrid-filter": "^0.3.7",
"backgrid-select-all": "^0.3.5", "backgrid-select-all": "^0.3.5",
"backgrid-sizeable-columns": "^0.1.1", "backgrid-sizeable-columns": "^0.1.1",
"bignumber.js": "^4.0.2", "bignumber.js": "^6.0.0",
"bootstrap": "^3.3.7", "bootstrap": "^3.3.7",
"bootstrap-datepicker": "^1.7.0", "bootstrap-datepicker": "^1.7.0",
"bootstrap-switch": "3.3.2", "bootstrap-switch": "3.3.4",
"bowser": "1.6.1", "bowser": "1.6.1",
"browserify": "~14.1.0", "browserify": "~14.1.0",
"codemirror": "^5.29.0", "codemirror": "^5.29.0",
@@ -69,8 +69,8 @@
"immutability-helper": "^2.2.0", "immutability-helper": "^2.2.0",
"imports-loader": "^0.7.1", "imports-loader": "^0.7.1",
"ip-address": "^5.8.9", "ip-address": "^5.8.9",
"jquery": "1.11.2", "jquery": "^1.11.2",
"jquery-contextmenu": "^2.5.0", "jquery-contextmenu": "^2.6.4",
"jquery-ui": "^1.12.1", "jquery-ui": "^1.12.1",
"moment": "^2.20.1", "moment": "^2.20.1",
"mousetrap": "^1.6.1", "mousetrap": "^1.6.1",
@@ -79,9 +79,9 @@
"react-dom": "^16.2.0", "react-dom": "^16.2.0",
"react-split-pane": "^0.1.63", "react-split-pane": "^0.1.63",
"requirejs": "~2.3.3", "requirejs": "~2.3.3",
"select2": "^4.0.3", "select2": "^4.0.6-rc.1",
"shim-loader": "^1.0.1", "shim-loader": "^1.0.1",
"slickgrid": "git+https://github.com/6pac/SlickGrid.git#2.3.7", "slickgrid": "git+https://github.com/6pac/SlickGrid.git#2.3.16",
"snapsvg": "^0.5.1", "snapsvg": "^0.5.1",
"spectrum-colorpicker": "^1.8.0", "spectrum-colorpicker": "^1.8.0",
"sprintf-js": "^1.1.1", "sprintf-js": "^1.1.1",
web/pgadmin/__init__.py
+1 -1
View File
@@ -16,7 +16,7 @@ from collections import defaultdict
from importlib import import_module from importlib import import_module
from flask import Flask, abort, request, current_app, session, url_for 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_login import user_logged_in, user_logged_out
from flask_mail import Mail from flask_mail import Mail
from flask_paranoid import Paranoid from flask_paranoid import Paranoid
web/pgadmin/about/__init__.py
+1 -1
View File
@@ -11,7 +11,7 @@
import sys import sys
from flask import Response, render_template, __version__, url_for 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 flask_security import current_user, login_required
from pgadmin.utils import PgAdminModule from pgadmin.utils import PgAdminModule
from pgadmin.utils.menu import MenuItem from pgadmin.utils.menu import MenuItem
web/pgadmin/browser/__init__.py
+1 -1
View File
@@ -18,7 +18,7 @@ from socket import error as SOCKETErrorException
import six import six
from flask import current_app, render_template, url_for, make_response, \ from flask import current_app, render_template, url_for, make_response, \
flash, Response, request, after_this_request, redirect flash, Response, request, after_this_request, redirect
from flask_babel import gettext from flask_babelex import gettext
from flask_gravatar import Gravatar from flask_gravatar import Gravatar
from flask_login import current_user, login_required from flask_login import current_user, login_required
from flask_security.changeable import change_user_password from flask_security.changeable import change_user_password
web/pgadmin/browser/collection.py
+1 -1
View File
@@ -11,7 +11,7 @@ from abc import ABCMeta, abstractmethod
import six import six
from flask import url_for, render_template 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 import BrowserPluginModule
from pgadmin.browser.utils import PGChildModule from pgadmin.browser.utils import PGChildModule
from pgadmin.utils import PgAdminModule from pgadmin.utils import PgAdminModule
web/pgadmin/browser/server_groups/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ from abc import ABCMeta, abstractmethod
import six import six
from flask import request, jsonify from flask import request, jsonify
from flask_babel import gettext from flask_babelex import gettext
from flask_security import current_user, login_required from flask_security import current_user, login_required
from pgadmin.browser import BrowserPluginModule from pgadmin.browser import BrowserPluginModule
from pgadmin.browser.utils import NodeView from pgadmin.browser.utils import NodeView
web/pgadmin/browser/server_groups/servers/__init__.py
+1 -1
View File
@@ -12,7 +12,7 @@ import re
import pgadmin.browser.server_groups as sg import pgadmin.browser.server_groups as sg
from flask import render_template, request, make_response, jsonify, \ from flask import render_template, request, make_response, jsonify, \
current_app, url_for current_app, url_for
from flask_babel import gettext from flask_babelex import gettext
from flask_security import current_user, login_required from flask_security import current_user, login_required
from pgadmin.browser.server_groups.servers.types import ServerType from pgadmin.browser.server_groups.servers.types import ServerType
from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.utils import PGChildNodeView
web/pgadmin/browser/server_groups/servers/databases/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ from functools import wraps
import simplejson as json import simplejson as json
from flask import render_template, current_app, request, jsonify 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 import pgadmin.browser.server_groups.servers as servers
from config import PG_DEFAULT_DRIVER from config import PG_DEFAULT_DRIVER
web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as databases import pgadmin.browser.server_groups.servers.databases as databases
from flask import render_template, request, jsonify 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.collection import CollectionNodeModule
from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.utils import PGChildNodeView
from pgadmin.utils.ajax import make_json_response, internal_server_error, \ from pgadmin.utils.ajax import make_json_response, internal_server_error, \
web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py
+1 -1
View File
@@ -13,7 +13,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database import pgadmin.browser.server_groups.servers.databases as database
from flask import render_template, request, jsonify 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.collection import CollectionNodeModule
from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.utils import PGChildNodeView
from pgadmin.utils.ajax import make_json_response, internal_server_error, \ from pgadmin.utils.ajax import make_json_response, internal_server_error, \
web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as databases import pgadmin.browser.server_groups.servers.databases as databases
from flask import render_template, request, jsonify 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.collection import CollectionNodeModule
from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.utils import PGChildNodeView
from pgadmin.utils.ajax import make_json_response, \ from pgadmin.utils.ajax import make_json_response, \
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as databases import pgadmin.browser.server_groups.servers.databases as databases
from flask import render_template, request, jsonify 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.collection import CollectionNodeModule
from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \
parse_priv_to_db, validate_options, tokenize_options parse_priv_to_db, validate_options, tokenize_options
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as databases import pgadmin.browser.server_groups.servers.databases as databases
from flask import render_template, make_response, request, jsonify 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.collection import CollectionNodeModule
from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \
parse_priv_to_db, validate_options, tokenize_options parse_priv_to_db, validate_options, tokenize_options
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/__init__.py
+1 -1
View File
@@ -16,7 +16,7 @@ import pgadmin.browser.server_groups.servers as servers
from pgadmin.browser.server_groups.servers.utils import \ from pgadmin.browser.server_groups.servers.utils import \
validate_options, tokenize_options validate_options, tokenize_options
from flask import render_template, make_response, request, jsonify 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.collection import CollectionNodeModule
from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.utils import PGChildNodeView
from pgadmin.utils.ajax import make_json_response, internal_server_error, \ from pgadmin.utils.ajax import make_json_response, internal_server_error, \
web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as databases import pgadmin.browser.server_groups.servers.databases as databases
from flask import render_template, request, jsonify 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.collection import CollectionNodeModule
from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \
parse_priv_to_db parse_priv_to_db
web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py
+1 -1
View File
@@ -12,7 +12,7 @@ from functools import wraps
import simplejson as json import simplejson as json
from flask import render_template, request, jsonify, current_app 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 import pgadmin.browser.server_groups.servers as servers
from config import PG_DEFAULT_DRIVER from config import PG_DEFAULT_DRIVER
web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py
+1 -1
View File
@@ -12,7 +12,7 @@
from functools import wraps from functools import wraps
from flask import render_template from flask import render_template
from flask_babel import gettext from flask_babelex import gettext
import pgadmin.browser.server_groups.servers.databases as database import pgadmin.browser.server_groups.servers.databases as database
from config import PG_DEFAULT_DRIVER from config import PG_DEFAULT_DRIVER
web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py
+1 -1
View File
@@ -12,7 +12,7 @@
from functools import wraps from functools import wraps
from flask import render_template from flask import render_template
from flask_babel import gettext from flask_babelex import gettext
import pgadmin.browser.server_groups.servers.databases as database import pgadmin.browser.server_groups.servers.databases as database
from config import PG_DEFAULT_DRIVER from config import PG_DEFAULT_DRIVER
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py
+1 -1
View File
@@ -13,7 +13,7 @@ from functools import wraps
import simplejson as json import simplejson as json
from flask import render_template, request, jsonify 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 import pgadmin.browser.server_groups.servers.databases as database
from config import PG_DEFAULT_DRIVER from config import PG_DEFAULT_DRIVER
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py
+1 -1
View File
@@ -13,7 +13,7 @@ from functools import wraps
import simplejson as json import simplejson as json
from flask import render_template, make_response, request, jsonify 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 import pgadmin.browser.server_groups.servers.databases as databases
from config import PG_DEFAULT_DRIVER from config import PG_DEFAULT_DRIVER
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py
+1 -1
View File
@@ -13,7 +13,7 @@ from functools import wraps
import simplejson as json import simplejson as json
from flask import render_template, request, jsonify 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 \ import pgadmin.browser.server_groups.servers.databases.schemas.domains \
as domains as domains
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py
+1 -1
View File
@@ -16,7 +16,7 @@ from functools import wraps
import simplejson as json import simplejson as json
from flask import render_template, make_response, request, jsonify, \ from flask import render_template, make_response, request, jsonify, \
current_app current_app
from flask_babel import gettext from flask_babelex import gettext
import pgadmin.browser.server_groups.servers.databases as databases import pgadmin.browser.server_groups.servers.databases as databases
from config import PG_DEFAULT_DRIVER from config import PG_DEFAULT_DRIVER
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py
+1 -1
View File
@@ -13,7 +13,7 @@ from functools import wraps
import simplejson as json import simplejson as json
from flask import render_template, make_response, current_app, request, jsonify 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 import pgadmin.browser.server_groups.servers.databases as databases
from config import PG_DEFAULT_DRIVER from config import PG_DEFAULT_DRIVER
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py
+1 -1
View File
@@ -13,7 +13,7 @@ from functools import wraps
import simplejson as json import simplejson as json
from flask import render_template, make_response, current_app, request, jsonify 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 import pgadmin.browser.server_groups.servers.databases as databases
from config import PG_DEFAULT_DRIVER from config import PG_DEFAULT_DRIVER
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/__init__.py
+1 -1
View File
@@ -13,7 +13,7 @@ from functools import wraps
import simplejson as json import simplejson as json
from flask import render_template, request, jsonify, current_app 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 config import PG_DEFAULT_DRIVER
from pgadmin.browser.server_groups.servers.databases import DatabaseModule from pgadmin.browser.server_groups.servers.databases import DatabaseModule
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py
+1 -1
View File
@@ -13,7 +13,7 @@ from functools import wraps
import simplejson as json import simplejson as json
from flask import render_template, make_response, request, jsonify 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 config import PG_DEFAULT_DRIVER
from pgadmin.browser.server_groups.servers.databases import DatabaseModule from pgadmin.browser.server_groups.servers.databases import DatabaseModule
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py
+1 -1
View File
@@ -19,7 +19,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as databases import pgadmin.browser.server_groups.servers.databases as databases
from flask import render_template, make_response, request, jsonify, \ from flask import render_template, make_response, request, jsonify, \
current_app current_app
from flask_babel import gettext from flask_babelex import gettext
from pgadmin.browser.server_groups.servers.databases.schemas.utils import \ from pgadmin.browser.server_groups.servers.databases.schemas.utils import \
SchemaChildModule, DataTypeReader SchemaChildModule, DataTypeReader
from pgadmin.browser.server_groups.servers.databases.utils import \ from pgadmin.browser.server_groups.servers.databases.utils import \
web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py
+1 -1
View File
@@ -13,7 +13,7 @@ from functools import wraps
import simplejson as json import simplejson as json
from flask import render_template, make_response, request, jsonify 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 import pgadmin.browser.server_groups.servers.databases as database
from config import PG_DEFAULT_DRIVER from config import PG_DEFAULT_DRIVER
web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ import re
from functools import wraps from functools import wraps
from flask import render_template, make_response from flask import render_template, make_response
from flask_babel import gettext from flask_babelex import gettext
import pgadmin.browser.server_groups.servers.databases\ import pgadmin.browser.server_groups.servers.databases\
.schemas.packages as packages .schemas.packages as packages
web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/__init__.py
+1 -1
View File
@@ -12,7 +12,7 @@
from functools import wraps from functools import wraps
from flask import render_template, make_response 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 \ import pgadmin.browser.server_groups.servers.databases.schemas \
.packages as packages .packages as packages
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py
+1 -1
View File
@@ -13,7 +13,7 @@ import simplejson as json
from functools import wraps from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database import pgadmin.browser.server_groups.servers.databases as database
from flask import render_template, make_response, request, jsonify 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 \ from pgadmin.browser.server_groups.servers.databases.schemas.utils \
import SchemaChildModule import SchemaChildModule
from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \
web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database import pgadmin.browser.server_groups.servers.databases as database
from flask import render_template, request, jsonify 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 \ from pgadmin.browser.server_groups.servers.databases.schemas.utils \
import SchemaChildModule import SchemaChildModule
from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.utils import PGChildNodeView
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ import re
import pgadmin.browser.server_groups.servers.databases as database import pgadmin.browser.server_groups.servers.databases as database
from flask import render_template, request, jsonify, url_for 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 \ from pgadmin.browser.server_groups.servers.databases.schemas.utils \
import SchemaChildModule, DataTypeReader, VacuumSettings import SchemaChildModule, DataTypeReader, VacuumSettings
from pgadmin.browser.server_groups.servers.utils import parse_priv_to_db from pgadmin.browser.server_groups.servers.utils import parse_priv_to_db
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database import pgadmin.browser.server_groups.servers.databases as database
from flask import render_template, request, jsonify 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.collection import CollectionNodeModule
from pgadmin.browser.server_groups.servers.databases.schemas.utils \ from pgadmin.browser.server_groups.servers.databases.schemas.utils \
import DataTypeReader import DataTypeReader
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py
+1 -1
View File
@@ -13,7 +13,7 @@ from functools import wraps
from pgadmin.utils.driver import get_driver from pgadmin.utils.driver import get_driver
import pgadmin.browser.server_groups.servers.databases as database import pgadmin.browser.server_groups.servers.databases as database
from flask import render_template, make_response 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.browser.collection import CollectionNodeModule
from pgadmin.utils.ajax import make_json_response, \ from pgadmin.utils.ajax import make_json_response, \
make_response as ajax_response, internal_server_error make_response as ajax_response, internal_server_error
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database import pgadmin.browser.server_groups.servers.databases as database
from flask import render_template, make_response, request, jsonify 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.collection import CollectionNodeModule
from pgadmin.browser.server_groups.servers.databases.schemas.tables.\ from pgadmin.browser.server_groups.servers.databases.schemas.tables.\
constraints.type import ConstraintRegistry constraints.type import ConstraintRegistry
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database import pgadmin.browser.server_groups.servers.databases as database
from flask import render_template, make_response, request, jsonify 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.\ from pgadmin.browser.server_groups.servers.databases.schemas.tables.\
constraints.type import ConstraintRegistry, ConstraintTypeModule constraints.type import ConstraintRegistry, ConstraintTypeModule
from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.utils import PGChildNodeView
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database import pgadmin.browser.server_groups.servers.databases as database
from flask import render_template, make_response, request, jsonify 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.\ from pgadmin.browser.server_groups.servers.databases.schemas.tables.\
constraints.type import ConstraintRegistry, ConstraintTypeModule constraints.type import ConstraintRegistry, ConstraintTypeModule
from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.utils import PGChildNodeView
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database import pgadmin.browser.server_groups.servers.databases as database
from flask import render_template, make_response, request, jsonify 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.\ from pgadmin.browser.server_groups.servers.databases.schemas.tables.\
constraints.type import ConstraintRegistry, ConstraintTypeModule constraints.type import ConstraintRegistry, ConstraintTypeModule
from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.utils import PGChildNodeView
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database import pgadmin.browser.server_groups.servers.databases as database
from flask import render_template, request, jsonify 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.collection import CollectionNodeModule
from pgadmin.browser.server_groups.servers.databases.schemas.tables.\ from pgadmin.browser.server_groups.servers.databases.schemas.tables.\
partitions import backend_supported partitions import backend_supported
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py
+1 -1
View File
@@ -13,7 +13,7 @@ import re
import simplejson as json import simplejson as json
import pgadmin.browser.server_groups.servers.databases.schemas as schema import pgadmin.browser.server_groups.servers.databases.schemas as schema
from flask import render_template, request 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 \ from pgadmin.browser.server_groups.servers.databases.schemas.utils \
import DataTypeReader, VacuumSettings import DataTypeReader, VacuumSettings
from pgadmin.utils.ajax import internal_server_error, \ from pgadmin.utils.ajax import internal_server_error, \
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases.schemas as schemas import pgadmin.browser.server_groups.servers.databases.schemas as schemas
from flask import render_template, make_response, request, jsonify 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.collection import CollectionNodeModule
from pgadmin.browser.server_groups.servers.databases.schemas.utils import \ from pgadmin.browser.server_groups.servers.databases.schemas.utils import \
parse_rule_definition parse_rule_definition
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database import pgadmin.browser.server_groups.servers.databases as database
from flask import render_template, request, jsonify 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.collection import CollectionNodeModule
from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.utils import PGChildNodeView
from pgadmin.utils.ajax import make_json_response, internal_server_error, \ from pgadmin.utils.ajax import make_json_response, internal_server_error, \
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py
+1 -1
View File
@@ -13,7 +13,7 @@ import re
from functools import wraps from functools import wraps
import simplejson as json import simplejson as json
from flask import render_template, jsonify, request 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, \ from pgadmin.utils.ajax import make_json_response, internal_server_error, \
make_response as ajax_response make_response as ajax_response
from pgadmin.browser.server_groups.servers.databases.schemas.utils \ from pgadmin.browser.server_groups.servers.databases.schemas.utils \
web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py
+1 -1
View File
@@ -13,7 +13,7 @@ from functools import wraps
import simplejson as json import simplejson as json
from flask import render_template, request, jsonify 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 import pgadmin.browser.server_groups.servers.databases as database
from config import PG_DEFAULT_DRIVER from config import PG_DEFAULT_DRIVER
web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py
+1 -1
View File
@@ -13,7 +13,7 @@ from functools import wraps
import simplejson as json import simplejson as json
from flask import render_template, request, jsonify, current_app 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 import pgadmin.browser.server_groups.servers.databases as databases
from config import PG_DEFAULT_DRIVER from config import PG_DEFAULT_DRIVER
web/pgadmin/browser/server_groups/servers/gpdb.py
+1 -1
View File
@@ -7,7 +7,7 @@
# #
########################################################################## ##########################################################################
from flask_babel import gettext from flask_babelex import gettext
from pgadmin.browser.server_groups.servers.types import ServerType from pgadmin.browser.server_groups.servers.types import ServerType
web/pgadmin/browser/server_groups/servers/pgagent/__init__.py
+1 -1
View File
@@ -12,7 +12,7 @@ from functools import wraps
import json import json
from flask import render_template, request, jsonify 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 from config import PG_DEFAULT_DRIVER
web/pgadmin/browser/server_groups/servers/pgagent/schedules/__init__.py
+1 -1
View File
@@ -13,7 +13,7 @@ import json
from functools import wraps from functools import wraps
from flask import render_template, request, jsonify 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.collection import CollectionNodeModule
from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.utils import PGChildNodeView
from pgadmin.utils.ajax import make_json_response, gone, \ from pgadmin.utils.ajax import make_json_response, gone, \
web/pgadmin/browser/server_groups/servers/pgagent/steps/__init__.py
+1 -1
View File
@@ -13,7 +13,7 @@ import json
from functools import wraps from functools import wraps
from flask import render_template, request, jsonify 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.collection import CollectionNodeModule
from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.utils import PGChildNodeView
from pgadmin.utils.ajax import make_json_response, gone, \ from pgadmin.utils.ajax import make_json_response, gone, \
web/pgadmin/browser/server_groups/servers/ppas.py
+1 -1
View File
@@ -7,7 +7,7 @@
# #
########################################################################## ##########################################################################
from flask_babel import gettext from flask_babelex import gettext
from pgadmin.browser.server_groups.servers.types import ServerType from pgadmin.browser.server_groups.servers.types import ServerType
web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers as servers import pgadmin.browser.server_groups.servers as servers
from flask import render_template, make_response, request, jsonify 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.collection import CollectionNodeModule
from pgadmin.browser.utils import NodeView from pgadmin.browser.utils import NodeView
from pgadmin.utils.ajax import make_json_response, \ from pgadmin.utils.ajax import make_json_response, \
web/pgadmin/browser/server_groups/servers/roles/__init__.py
+1 -1
View File
@@ -12,7 +12,7 @@ from functools import wraps
import pgadmin.browser.server_groups as sg import pgadmin.browser.server_groups as sg
import simplejson as json import simplejson as json
from flask import render_template, request, jsonify, current_app 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 import dateutil.parser as dateutil_parser
from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.utils import PGChildNodeView
web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py
+1 -1
View File
@@ -12,7 +12,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers as servers import pgadmin.browser.server_groups.servers as servers
from flask import render_template, make_response, request, jsonify, current_app 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.collection import CollectionNodeModule
from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \
parse_priv_to_db parse_priv_to_db
web/pgadmin/browser/server_groups/servers/types.py
+1 -1
View File
@@ -11,7 +11,7 @@ import os
import sys import sys
from flask import render_template from flask import render_template
from flask_babel import gettext as _ from flask_babelex import gettext as _
from pgadmin.utils.preferences import Preferences from pgadmin.utils.preferences import Preferences
import config import config
web/pgadmin/browser/utils.py
+1 -1
View File
@@ -14,7 +14,7 @@ from abc import abstractmethod
import flask import flask
from flask import render_template, current_app from flask import render_template, current_app
from flask.views import View, MethodViewType, with_metaclass 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 config import PG_DEFAULT_DRIVER
from pgadmin.utils.ajax import make_json_response, precondition_required from pgadmin.utils.ajax import make_json_response, precondition_required
web/pgadmin/dashboard/__init__.py
+1 -1
View File
@@ -10,7 +10,7 @@
"""A blueprint module implementing the dashboard frame.""" """A blueprint module implementing the dashboard frame."""
from functools import wraps from functools import wraps
from flask import render_template, url_for, Response, g 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 flask_security import login_required
from pgadmin.utils import PgAdminModule from pgadmin.utils import PgAdminModule
from pgadmin.utils.ajax import make_response as ajax_response,\ from pgadmin.utils.ajax import make_response as ajax_response,\
web/pgadmin/help/__init__.py
+1 -1
View File
@@ -9,7 +9,7 @@
"""A blueprint module implementing the pgAdmin help system.""" """A blueprint module implementing the pgAdmin help system."""
from flask import url_for from flask import url_for
from flask_babel import gettext from flask_babelex import gettext
from pgadmin.utils import PgAdminModule from pgadmin.utils import PgAdminModule
from pgadmin.utils.menu import MenuItem, Panel from pgadmin.utils.menu import MenuItem, Panel
from pgadmin.utils.preferences import Preferences from pgadmin.utils.preferences import Preferences
web/pgadmin/misc/__init__.py
+1 -1
View File
@@ -11,7 +11,7 @@
import pgadmin.utils.driver as driver import pgadmin.utils.driver as driver
from flask import url_for, render_template, Response, request 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 import PgAdminModule
from pgadmin.utils.preferences import Preferences from pgadmin.utils.preferences import Preferences
web/pgadmin/misc/bgprocess/processes.py
+1 -1
View File
@@ -25,7 +25,7 @@ from pgadmin.utils import IS_PY2, u, file_quote, fs_encoding, \
import pytz import pytz
from dateutil import parser from dateutil import parser
from flask import current_app from flask import current_app
from flask_babel import gettext as _ from flask_babelex import gettext as _
from flask_security import current_user from flask_security import current_user
import config import config
web/pgadmin/misc/file_manager/__init__.py
+1 -1
View File
@@ -22,7 +22,7 @@ import codecs
import simplejson as json import simplejson as json
from flask import render_template, Response, session, request as req, \ from flask import render_template, Response, session, request as req, \
url_for, current_app url_for, current_app
from flask_babel import gettext from flask_babelex import gettext
from flask_security import login_required from flask_security import login_required
from pgadmin.utils import PgAdminModule from pgadmin.utils import PgAdminModule
from pgadmin.utils import get_storage_directory from pgadmin.utils import get_storage_directory
web/pgadmin/preferences/__init__.py
+1 -1
View File
@@ -15,7 +15,7 @@ side and for getting/setting preferences.
import config import config
import simplejson as json import simplejson as json
from flask import render_template, url_for, Response, request, session 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 flask_security import login_required
from pgadmin.utils import PgAdminModule from pgadmin.utils import PgAdminModule
from pgadmin.utils.ajax import success_return, \ from pgadmin.utils.ajax import success_return, \
web/pgadmin/settings/__init__.py
+1 -1
View File
@@ -12,7 +12,7 @@
import traceback import traceback
from flask import Response, request, render_template, url_for 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_login import current_user
from flask_security import login_required from flask_security import login_required
from pgadmin.utils import PgAdminModule from pgadmin.utils import PgAdminModule
web/pgadmin/tools/__init__.py
+4 -2
View File
@@ -11,7 +11,7 @@
from flask import render_template, Response from flask import render_template, Response
from flask import url_for 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 import PgAdminModule
from pgadmin.utils.ajax import bad_request from pgadmin.utils.ajax import bad_request
@@ -64,9 +64,11 @@ def translations():
"""Return a js file that will handle translations so Flask interpolation """Return a js file that will handle translations so Flask interpolation
can be isolated can be isolated
""" """
domain = Domain()
translations = domain.get_translations()
template = render_template( template = render_template(
"js/translations.js", "js/translations.js",
translations=get_translations()._catalog translations=translations._catalog
) )
return Response( return Response(
response=template, response=template,
web/pgadmin/tools/backup/__init__.py
+1 -1
View File
@@ -15,7 +15,7 @@ import os
from flask import render_template, request, current_app, \ from flask import render_template, request, current_app, \
url_for, Response url_for, Response
from flask_babel import gettext as _ from flask_babelex import gettext as _
from flask_security import login_required, current_user from flask_security import login_required, current_user
from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc
from pgadmin.utils import PgAdminModule, get_storage_directory, html, \ from pgadmin.utils import PgAdminModule, get_storage_directory, html, \
web/pgadmin/tools/debugger/__init__.py
+1 -1
View File
@@ -16,7 +16,7 @@ import random
from flask import url_for, Response, render_template, request, session, \ from flask import url_for, Response, render_template, request, session, \
current_app current_app
from flask_babel import gettext from flask_babelex import gettext
from flask_security import login_required from flask_security import login_required
from werkzeug.useragents import UserAgent from werkzeug.useragents import UserAgent
web/pgadmin/tools/grant_wizard/__init__.py
+1 -1
View File
@@ -12,7 +12,7 @@
import simplejson as json import simplejson as json
from flask import Response, url_for from flask import Response, url_for
from flask import render_template, request, current_app 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 flask_security import login_required
from pgadmin.browser.server_groups.servers.utils import parse_priv_to_db from pgadmin.browser.server_groups.servers.utils import parse_priv_to_db
from pgadmin.utils import PgAdminModule from pgadmin.utils import PgAdminModule
web/pgadmin/tools/import_export/__init__.py
+1 -1
View File
@@ -13,7 +13,7 @@ import simplejson as json
import os import os
from flask import url_for, Response, render_template, request, current_app 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 flask_security import login_required, current_user
from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc
from pgadmin.utils import PgAdminModule, get_storage_directory, html, \ from pgadmin.utils import PgAdminModule, get_storage_directory, html, \
web/pgadmin/tools/maintenance/__init__.py
+1 -1
View File
@@ -12,7 +12,7 @@
import simplejson as json import simplejson as json
from flask import url_for, Response, render_template, request, current_app 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 flask_security import login_required
from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc
from pgadmin.utils import PgAdminModule, html from pgadmin.utils import PgAdminModule, html
web/pgadmin/tools/restore/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ import os
from flask import render_template, request, current_app, \ from flask import render_template, request, current_app, \
url_for, Response url_for, Response
from flask_babel import gettext as _ from flask_babelex import gettext as _
from flask_security import login_required, current_user from flask_security import login_required, current_user
from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc
from pgadmin.utils import PgAdminModule, get_storage_directory, html, \ from pgadmin.utils import PgAdminModule, get_storage_directory, html, \
web/pgadmin/tools/sqleditor/__init__.py
+1 -1
View File
@@ -16,7 +16,7 @@ import random
import simplejson as json import simplejson as json
from flask import Response, url_for, render_template, session, request, \ from flask import Response, url_for, render_template, session, request, \
current_app current_app
from flask_babel import gettext from flask_babelex import gettext
from flask_security import login_required from flask_security import login_required
from config import PG_DEFAULT_DRIVER, ON_DEMAND_RECORD_COUNT from config import PG_DEFAULT_DRIVER, ON_DEMAND_RECORD_COUNT
web/pgadmin/tools/sqleditor/command.py
+1 -1
View File
@@ -16,7 +16,7 @@ except ImportError:
from ordereddict import OrderedDict from ordereddict import OrderedDict
import six import six
from flask import render_template from flask import render_template
from flask_babel import gettext from flask_babelex import gettext
from pgadmin.utils.ajax import forbidden from pgadmin.utils.ajax import forbidden
from pgadmin.utils.driver import get_driver from pgadmin.utils.driver import get_driver
web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py
+1 -1
View File
@@ -8,7 +8,7 @@
########################################################################## ##########################################################################
"""Register preferences for query tool""" """Register preferences for query tool"""
from flask_babel import gettext from flask_babelex import gettext
from pgadmin.utils import SHORTCUT_FIELDS as shortcut_fields, \ from pgadmin.utils import SHORTCUT_FIELDS as shortcut_fields, \
ACCESSKEY_FIELDS as accesskey_fields ACCESSKEY_FIELDS as accesskey_fields
from pgadmin.utils.preferences import Preferences from pgadmin.utils.preferences import Preferences
web/pgadmin/tools/sqleditor/utils/start_running_query.py
+1 -1
View File
@@ -13,7 +13,7 @@ import pickle
import random import random
from flask import Response from flask import Response
from flask_babel import gettext from flask_babelex import gettext
from config import PG_DEFAULT_DRIVER from config import PG_DEFAULT_DRIVER
from pgadmin.tools.sqleditor.utils.apply_explain_plan_wrapper import \ from pgadmin.tools.sqleditor.utils.apply_explain_plan_wrapper import \
web/pgadmin/tools/user_management/__init__.py
+1 -1
View File
@@ -14,7 +14,7 @@ import re
from flask import render_template, request, \ from flask import render_template, request, \
url_for, Response, abort, current_app 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 import login_required, roles_required, current_user
from flask_security.utils import encrypt_password from flask_security.utils import encrypt_password
web/pgadmin/utils/__init__.py
+1 -1
View File
@@ -13,7 +13,7 @@ from collections import defaultdict
from operator import attrgetter from operator import attrgetter
from flask import Blueprint, current_app from flask import Blueprint, current_app
from flask_babel import gettext from flask_babelex import gettext
from .paths import get_storage_directory from .paths import get_storage_directory
from .preferences import Preferences from .preferences import Preferences
web/pgadmin/utils/ajax.py
+1 -1
View File
@@ -14,7 +14,7 @@ import decimal
import simplejson as json import simplejson as json
from flask import Response from flask import Response
from flask_babel import gettext as _ from flask_babelex import gettext as _
class DataTypeJSONEncoder(json.JSONEncoder): class DataTypeJSONEncoder(json.JSONEncoder):
web/pgadmin/utils/crypto.py
+9 -8
View File
@@ -28,10 +28,10 @@ def encrypt(plaintext, key):
""" """
iv = Random.new().read(AES.block_size) 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) # If user has entered non ascii password (Python2)
# we have to encode it first # 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)) encrypted = base64.b64encode(iv + cipher.encrypt(plaintext))
@@ -51,32 +51,33 @@ def decrypt(ciphertext, key):
ciphertext = base64.b64decode(ciphertext) ciphertext = base64.b64decode(ciphertext)
iv = ciphertext[:AES.block_size] 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:]) decrypted = cipher.decrypt(ciphertext[AES.block_size:])
return decrypted return decrypted
def pad(str): def pad(key):
"""Add padding to the key.""" """Add padding to the key."""
global padding_string global padding_string
str_len = len(str) str_len = len(key)
# Key must be maximum 32 bytes long, so take first 32 bytes # Key must be maximum 32 bytes long, so take first 32 bytes
if str_len > 32: if str_len > 32:
return str[:32] return key[:32]
# If key size id 16, 24 or 32 bytes then padding not require # 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: if str_len == 16 or str_len == 24 or str_len == 32:
return str return key
# Convert bytes to string (python3) # Convert bytes to string (python3)
if not hasattr(str, 'decode'): if not hasattr(str, 'decode'):
padding_string = padding_string.decode() padding_string = padding_string.decode()
# Add padding to make key 32 bytes long # 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): def pqencryptpassword(password, user):
web/pgadmin/utils/driver/psycopg2/__init__.py
+1 -1
View File
@@ -15,7 +15,7 @@ object.
""" """
import datetime import datetime
from flask import session from flask import session
from flask_babel import gettext from flask_babelex import gettext
import psycopg2 import psycopg2
from psycopg2.extensions import adapt from psycopg2.extensions import adapt
web/pgadmin/utils/driver/psycopg2/connection.py
+1 -1
View File
@@ -20,7 +20,7 @@ from collections import deque
import simplejson as json import simplejson as json
import psycopg2 import psycopg2
from flask import g, current_app from flask import g, current_app
from flask_babel import gettext from flask_babelex import gettext
from flask_security import current_user from flask_security import current_user
from pgadmin.utils.crypto import decrypt from pgadmin.utils.crypto import decrypt
from psycopg2.extensions import adapt, encodings from psycopg2.extensions import adapt, encodings
web/pgadmin/utils/driver/psycopg2/server_manager.py
+1 -1
View File
@@ -14,7 +14,7 @@ import os
import datetime import datetime
from flask import current_app, session from flask import current_app, session
from flask_security import current_user from flask_security import current_user
from flask_babel import gettext from flask_babelex import gettext
from pgadmin.utils.crypto import decrypt from pgadmin.utils.crypto import decrypt
from .connection import Connection from .connection import Connection
web/pgadmin/utils/driver/registry.py
+1 -1
View File
@@ -9,7 +9,7 @@
from abc import ABCMeta from abc import ABCMeta
from flask_babel import gettext from flask_babelex import gettext
def _decorate_cls_name(module_name): def _decorate_cls_name(module_name):
web/pgadmin/utils/exception.py
+1 -1
View File
@@ -9,7 +9,7 @@
from werkzeug.exceptions import HTTPException from werkzeug.exceptions import HTTPException
from werkzeug.http import HTTP_STATUS_CODES from werkzeug.http import HTTP_STATUS_CODES
from flask_babel import gettext as _ from flask_babelex import gettext as _
from flask import request from flask import request
from pgadmin.utils.ajax import service_unavailable from pgadmin.utils.ajax import service_unavailable
web/pgadmin/utils/preferences.py
+1 -1
View File
@@ -17,7 +17,7 @@ import simplejson as json
import dateutil.parser as dateutil_parser import dateutil.parser as dateutil_parser
from flask import current_app from flask import current_app
from flask_babel import gettext from flask_babelex import gettext
from flask_security import current_user from flask_security import current_user
from pgadmin.model import db, Preferences as PrefTable, \ from pgadmin.model import db, Preferences as PrefTable, \
web/regression/requirements.txt
+3 -3
View File
@@ -7,11 +7,11 @@
# Add all the development dependencies here # Add all the development dependencies here
########################################### ###########################################
pycodestyle==2.3.1 pycodestyle==2.3.1
pyperclip~=1.5.27 pyperclip~=1.6.0
selenium==3.3.3; python_version < '2.7' selenium==3.3.3; python_version < '2.7'
selenium==3.7.0; python_version >= '2.7' selenium==3.11.0; python_version >= '2.7'
testscenarios==0.5.0 testscenarios==0.5.0
testtools==2.0.0 testtools==2.3.0
traceback2==1.4.0 traceback2==1.4.0
unittest2==1.1.0 unittest2==1.1.0
mock===2.0.0; python_version < '3.3' mock===2.0.0; python_version < '3.3'
web/yarn.lock
+40 -32
View File
@@ -355,9 +355,9 @@ aws4@^1.2.1, aws4@^1.6.0:
version "1.6.0" version "1.6.0"
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
axios-mock-adapter@^1.11.0: axios-mock-adapter@^1.14.1:
version "1.11.0" version "1.14.1"
resolved "https://registry.yarnpkg.com/axios-mock-adapter/-/axios-mock-adapter-1.11.0.tgz#96e4bb2702cf6900f2ae5f9bdbef6e5dc86669e2" resolved "https://registry.yarnpkg.com/axios-mock-adapter/-/axios-mock-adapter-1.14.1.tgz#c8e0ee1134955267538d566d7ae068be20467158"
dependencies: dependencies:
deep-equal "^1.0.1" deep-equal "^1.0.1"
@@ -367,11 +367,11 @@ axios@^0.15.3:
dependencies: dependencies:
follow-redirects "1.0.0" follow-redirects "1.0.0"
axios@^0.16.1: axios@^0.18.0:
version "0.16.2" version "0.18.0"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.16.2.tgz#ba4f92f17167dfbab40983785454b9ac149c3c6d" resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
dependencies: dependencies:
follow-redirects "^1.2.3" follow-redirects "^1.3.0"
is-buffer "^1.1.5" is-buffer "^1.1.5"
babel-code-frame@^6.16.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: babel-code-frame@^6.16.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
@@ -1058,12 +1058,18 @@ babylon@^6.11.0, babylon@^6.18.0:
version "6.18.0" version "6.18.0"
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
backbone@1.1.2, "backbone@1.1.2 || 1.2.3 || ~1.3.2": "backbone@1.1.2 || 1.2.3 || ~1.3.2":
version "1.1.2" version "1.1.2"
resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.1.2.tgz#c2c04c66bf87268fb82c177acebeff7d37ba6f2d" resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.1.2.tgz#c2c04c66bf87268fb82c177acebeff7d37ba6f2d"
dependencies: dependencies:
underscore ">=1.5.0" underscore ">=1.5.0"
backbone@1.3.3:
version "1.3.3"
resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.3.3.tgz#4cc80ea7cb1631ac474889ce40f2f8bc683b2999"
dependencies:
underscore ">=1.8.3"
backbone@~1.2.3: backbone@~1.2.3:
version "1.2.3" version "1.2.3"
resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.2.3.tgz#c22cfd07fc86ebbeae61d18929ed115e999d65b9" resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.2.3.tgz#c22cfd07fc86ebbeae61d18929ed115e999d65b9"
@@ -1146,9 +1152,9 @@ bignumber.js@^2.4.0:
version "2.4.0" version "2.4.0"
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-2.4.0.tgz#838a992da9f9d737e0f4b2db0be62bb09dd0c5e8" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-2.4.0.tgz#838a992da9f9d737e0f4b2db0be62bb09dd0c5e8"
bignumber.js@^4.0.2: bignumber.js@^6.0.0:
version "4.1.0" version "6.0.0"
resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz#db6f14067c140bd46624815a7916c92d9b6c24b1" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-6.0.0.tgz#bbfa047644609a5af093e9cbd83b0461fa3f6002"
bin-build@^2.0.0: bin-build@^2.0.0:
version "2.2.0" version "2.2.0"
@@ -1285,11 +1291,9 @@ bootstrap-datepicker@^1.7.0:
dependencies: dependencies:
jquery ">=1.7.1 <4.0.0" jquery ">=1.7.1 <4.0.0"
bootstrap-switch@3.3.2: bootstrap-switch@3.3.4:
version "3.3.2" version "3.3.4"
resolved "https://registry.yarnpkg.com/bootstrap-switch/-/bootstrap-switch-3.3.2.tgz#79ddb49fadc308fb731e257f95957af48996eea7" resolved "https://registry.yarnpkg.com/bootstrap-switch/-/bootstrap-switch-3.3.4.tgz#70e0aeb2a877c0dc766991de108e2170fc29a2ff"
dependencies:
jquery ">=1.9.0"
bootstrap@^3.3, bootstrap@^3.3.7: bootstrap@^3.3, bootstrap@^3.3.7:
version "3.3.7" version "3.3.7"
@@ -2235,7 +2239,7 @@ dateformat@^2.0.0:
version "2.2.0" version "2.2.0"
resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062" resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
debug@2, debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.4.5, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6: debug@2, debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6:
version "2.6.9" version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
dependencies: dependencies:
@@ -3260,11 +3264,11 @@ follow-redirects@1.0.0:
dependencies: dependencies:
debug "^2.2.0" debug "^2.2.0"
follow-redirects@^1.2.3: follow-redirects@^1.3.0:
version "1.2.4" version "1.4.1"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.2.4.tgz#355e8f4d16876b43f577b0d5ce2668b9723214ea" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.4.1.tgz#d8120f4518190f55aac65bb6fc7b85fcd666d6aa"
dependencies: dependencies:
debug "^2.4.5" debug "^3.1.0"
font-awesome@4.6.3: font-awesome@4.6.3:
version "4.6.3" version "4.6.3"
@@ -4558,9 +4562,9 @@ jquery-contextmenu@1.6.7:
dependencies: dependencies:
jquery ">=1.7.0" jquery ">=1.7.0"
jquery-contextmenu@^2.5.0: jquery-contextmenu@^2.6.4:
version "2.6.2" version "2.6.4"
resolved "https://registry.yarnpkg.com/jquery-contextmenu/-/jquery-contextmenu-2.6.2.tgz#83c7ba45c67c814cc4095b19551fd12e5d71da7e" resolved "https://registry.yarnpkg.com/jquery-contextmenu/-/jquery-contextmenu-2.6.4.tgz#f48e56c436b1becb6935e5dd0def02e39d4e129e"
jquery-mousewheel@~3.1.13: jquery-mousewheel@~3.1.13:
version "3.1.13" version "3.1.13"
@@ -4574,10 +4578,14 @@ jquery@1.11.1:
version "1.11.1" version "1.11.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-1.11.1.tgz#b6ec928590112ebed69e1e49cbfd0025ccd60ddb" resolved "https://registry.yarnpkg.com/jquery/-/jquery-1.11.1.tgz#b6ec928590112ebed69e1e49cbfd0025ccd60ddb"
jquery@1.11.2, jquery@>=1.7.0, "jquery@>=1.7.1 <4.0.0", jquery@>=1.8.0, jquery@>=1.9.0, "jquery@^1.8.3 || ^2.0 || ^3.0": jquery@>=1.7.0, "jquery@>=1.7.1 <4.0.0", jquery@>=1.8.0, "jquery@^1.8.3 || ^2.0 || ^3.0":
version "1.11.2" version "1.11.2"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-1.11.2.tgz#30ab26857211c37caa83da0f6903155fe49bb72d" resolved "https://registry.yarnpkg.com/jquery/-/jquery-1.11.2.tgz#30ab26857211c37caa83da0f6903155fe49bb72d"
jquery@^1.11.2:
version "1.12.4"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-1.12.4.tgz#01e1dfba290fe73deba77ceeacb0f9ba2fec9e0c"
js-base64@^2.1.8, js-base64@^2.1.9: js-base64@^2.1.8, js-base64@^2.1.9:
version "2.3.2" version "2.3.2"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.2.tgz#a79a923666372b580f8e27f51845c6f7e8fbfbaf" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.2.tgz#a79a923666372b580f8e27f51845c6f7e8fbfbaf"
@@ -7115,9 +7123,9 @@ seek-bzip@^1.0.3:
dependencies: dependencies:
commander "~2.8.1" commander "~2.8.1"
select2@^4.0.3: select2@^4.0.6-rc.1:
version "4.0.3" version "4.0.6-rc.1"
resolved "https://registry.yarnpkg.com/select2/-/select2-4.0.3.tgz#207733fe91eacb9cb1a13f12463401f472449e0f" resolved "https://registry.yarnpkg.com/select2/-/select2-4.0.6-rc.1.tgz#aa6c3038a7f0f2e91ffade38f0a21c15e1813276"
dependencies: dependencies:
almond "~0.3.1" almond "~0.3.1"
jquery-mousewheel "~3.1.13" jquery-mousewheel "~3.1.13"
@@ -7259,9 +7267,9 @@ slice-ansi@^1.0.0:
dependencies: dependencies:
is-fullwidth-code-point "^2.0.0" is-fullwidth-code-point "^2.0.0"
"slickgrid@git+https://github.com/6pac/SlickGrid.git#2.3.7": "slickgrid@git+https://github.com/6pac/SlickGrid.git#2.3.16":
version "2.3.4" version "2.3.16"
resolved "git+https://github.com/6pac/SlickGrid.git#8ff68140bd5be132d2913640b4b1f2512219d075" resolved "git+https://github.com/6pac/SlickGrid.git#4f8c6f498d0b82391fdf382beb8ef114ed7408e7"
dependencies: dependencies:
jquery ">=1.8.0" jquery ">=1.8.0"
jquery-ui ">=1.8.0" jquery-ui ">=1.8.0"
@@ -7958,7 +7966,7 @@ underscore.string@^3.3.4:
sprintf-js "^1.0.3" sprintf-js "^1.0.3"
util-deprecate "^1.0.2" util-deprecate "^1.0.2"
underscore@>=1.5.0, underscore@>=1.7.0, underscore@^1.8.0, underscore@^1.8.3: underscore@>=1.5.0, underscore@>=1.7.0, underscore@>=1.8.3, underscore@^1.8.0, underscore@^1.8.3:
version "1.8.3" version "1.8.3"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"