IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Stop using deprecated imports.

Browse Source
This commit is contained in:
Dave Page
2016-07-22 16:25:23 +01:00
parent a014cf82a1
commit 60659975ed
74 changed files with 115 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
requirements_py2.txt
View File

@@ -4,15 +4,15 @@ blinker==1.3
django-htmlmin==0.8.0
extras==0.0.3
fixtures==2.0.0
Flask==0.10.1
Flask-Babel==0.9
Flask==0.11.1
Flask-Babel==0.11.1
Flask-Gravatar==0.4.2
Flask-Login==0.2.11
Flask-Login==0.3.2
Flask-Mail==0.9.1
Flask-Principal==0.4.0
Flask-Security==1.7.4
Flask-SQLAlchemy==2.0
Flask-WTF==0.11
Flask-Security==1.7.5
Flask-SQLAlchemy==2.1
Flask-WTF==0.12
html5lib==1.0b3
importlib==1.0.3
itsdangerous==0.24
@@ -30,7 +30,7 @@ pytz==2014.10
simplejson==3.6.5
six==1.9.0
speaklater==1.3
SQLAlchemy==0.9.8
SQLAlchemy==1.0.14
testscenarios==0.5.0
testtools==2.0.0
traceback2==1.4.0

14
requirements_py3.txt
View File

@@ -4,15 +4,15 @@ blinker==1.3
django-htmlmin==0.8.0
extras==0.0.3
fixtures==2.0.0
Flask==0.10.1
Flask-Babel==0.9
Flask==0.11.1
Flask-Babel==0.11.1
Flask-Gravatar==0.4.2
Flask-Login==0.2.11
Flask-Login==0.3.2
Flask-Mail==0.9.1
Flask-Principal==0.4.0
Flask-Security==1.7.4
Flask-SQLAlchemy==2.0
Flask-WTF==0.11
Flask-Security==1.7.5
Flask-SQLAlchemy==2.1
Flask-WTF==0.12
html5lib==1.0b3
itsdangerous==0.24
Jinja2==2.7.3
@@ -29,7 +29,7 @@ pytz==2014.10
simplejson==3.6.5
six==1.9.0
speaklater==1.3
SQLAlchemy==0.9.8
SQLAlchemy==1.0.14
testscenarios==0.5.0
testtools==2.0.0
traceback2==1.4.0

6
web/pgadmin/__init__.py
View File

@@ -15,9 +15,9 @@ from collections import defaultdict
from importlib import import_module
from flask import Flask, abort, request, current_app
from flask.ext.babel import Babel, gettext
from flask.ext.login import user_logged_in
from flask.ext.security import Security, SQLAlchemyUserDatastore
from flask_babel import Babel, gettext
from flask_login import user_logged_in
from flask_security import Security, SQLAlchemyUserDatastore
from flask_mail import Mail
from flask_security.utils import login_user
from htmlmin.minify import html_minify

4
web/pgadmin/about/__init__.py
View File

@@ -13,8 +13,8 @@ MODULE_NAME = 'about'
import sys
from flask import Response, render_template, __version__, url_for
from flask.ext.babel import gettext
from flask.ext.security import current_user, login_required
from flask_babel import gettext
from flask_security import current_user, login_required
from pgadmin.utils import PgAdminModule
from pgadmin.utils.menu import MenuItem

6
web/pgadmin/browser/__init__.py
View File

@@ -12,9 +12,9 @@ from abc import ABCMeta, abstractmethod, abstractproperty
import six
from flask import current_app, render_template, url_for, make_response, flash
from flask.ext.babel import gettext
from flask.ext.login import current_user
from flask.ext.security import login_required
from flask_babel import gettext
from flask_login import current_user
from flask_security import login_required
from flask_gravatar import Gravatar
from pgadmin.settings import get_setting
from pgadmin.utils import PgAdminModule

2
web/pgadmin/browser/collection.py
View File

@@ -11,7 +11,7 @@ from abc import ABCMeta, abstractmethod
import six
from flask import url_for, render_template
from flask.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser import BrowserPluginModule
from pgadmin.browser.utils import PGChildModule
from pgadmin.utils import PgAdminModule

4
web/pgadmin/browser/server_groups/__init__.py
View File

@@ -13,8 +13,8 @@ from abc import ABCMeta, abstractmethod
import six
from flask import request, render_template, make_response, jsonify
from flask.ext.babel import gettext
from flask.ext.security import current_user
from flask_babel import gettext
from flask_security import current_user
from pgadmin.browser import BrowserPluginModule
from pgadmin.browser.utils import NodeView
from pgadmin.utils.ajax import make_json_response, \

4
web/pgadmin/browser/server_groups/servers/__init__.py
View File

@@ -13,8 +13,8 @@ import traceback
import pgadmin.browser.server_groups as sg
from flask import render_template, request, make_response, jsonify, \
current_app, url_for
from flask.ext.babel import gettext
from flask.ext.security import current_user
from flask_babel import gettext
from flask_security import current_user
from pgadmin.browser.server_groups.servers.types import ServerType
from pgadmin.browser.utils import PGChildNodeView
from pgadmin.utils.ajax import make_json_response, bad_request, forbidden, \

2
web/pgadmin/browser/server_groups/servers/databases/__init__.py
View File

@@ -15,7 +15,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers as servers
from flask import render_template, make_response, current_app, request, jsonify
from flask.ext.babel import gettext as _
from flask_babel import gettext as _
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.server_groups.servers.databases.utils import \
parse_sec_labels_from_db, parse_variables_from_db

2
web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py
View File

@@ -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.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.utils import PGChildNodeView
from pgadmin.utils.ajax import make_json_response, \

2
web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py
View File

@@ -13,7 +13,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.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.utils import PGChildNodeView
from pgadmin.utils.ajax import make_json_response, \

2
web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py
View File

@@ -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.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.utils import PGChildNodeView
from pgadmin.utils.ajax import make_json_response, \

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py
View File

@@ -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.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \
parse_priv_to_db

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py
View File

@@ -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.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \
parse_priv_to_db

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/__init__.py
View File

@@ -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.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.utils import PGChildNodeView
from pgadmin.utils.ajax import make_json_response, \

2
web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py
View File

@@ -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
from flask.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \
parse_priv_to_db

2
web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py
View File

@@ -13,7 +13,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers as servers
from flask import render_template, request, jsonify, current_app
from flask.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.collection import CollectionNodeModule, PGChildModule
from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \
parse_priv_to_db

2
web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py
View File

@@ -13,7 +13,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database
from flask import render_template
from flask.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.server_groups.servers.databases.schemas.utils \
import SchemaChildModule
from pgadmin.browser.utils import PGChildNodeView

2
web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py
View File

@@ -13,7 +13,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database
from flask import render_template
from flask.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.utils import PGChildNodeView
from pgadmin.utils.ajax import make_json_response, \

2
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py
View File

@@ -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.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.server_groups.servers.databases.schemas.utils \
import SchemaChildModule
from pgadmin.browser.utils import PGChildNodeView

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py
View File

@@ -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.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.server_groups.servers.databases.schemas.utils import \
SchemaChildModule, DataTypeReader
from pgadmin.browser.server_groups.servers.databases.utils import \

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py
View File

@@ -15,7 +15,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases.schemas.domains \
as domains
from flask import render_template, make_response, request, jsonify
from flask.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.utils import PGChildNodeView
from pgadmin.utils.ajax import make_json_response, \

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py
View File

@@ -17,7 +17,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.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.server_groups.servers.databases.schemas.utils import \
SchemaChildModule, DataTypeReader
from pgadmin.browser.server_groups.servers.databases.utils import \

2
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py
View File

@@ -14,7 +14,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as databases
from flask import render_template, make_response, current_app, request, jsonify
from flask.ext.babel import gettext as _
from flask_babel import gettext as _
from pgadmin.browser.server_groups.servers.databases.schemas.utils \
import SchemaChildModule
from pgadmin.browser.utils import PGChildNodeView

2
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py
View File

@@ -14,7 +14,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as databases
from flask import render_template, make_response, current_app, request, jsonify
from flask.ext.babel import gettext as _
from flask_babel import gettext as _
from pgadmin.browser.server_groups.servers.databases.schemas.utils \
import SchemaChildModule
from pgadmin.browser.utils import PGChildNodeView

2
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/__init__.py
View File

@@ -13,7 +13,7 @@ import json
from functools import wraps
from flask import render_template, request, jsonify, current_app
from flask.ext.babel import gettext as _
from flask_babel import gettext as _
from pgadmin.browser.server_groups.servers.databases import DatabaseModule
from pgadmin.browser.server_groups.servers.databases.schemas.utils import SchemaChildModule
from pgadmin.browser.utils import PGChildNodeView

2
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py
View File

@@ -13,7 +13,7 @@ import json
from functools import wraps
from flask import render_template, make_response, request, jsonify
from flask.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.server_groups.servers.databases import DatabaseModule
from pgadmin.browser.server_groups.servers.databases.schemas.utils import SchemaChildModule
from pgadmin.browser.utils import PGChildNodeView

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py
View File

@@ -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.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.server_groups.servers.databases.schemas.utils import \
SchemaChildModule, DataTypeReader
from pgadmin.browser.server_groups.servers.databases.utils import \

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py
View File

@@ -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.ext.babel import gettext as _
from flask_babel 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, \

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py
View File

@@ -15,7 +15,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database
from flask import render_template, request, jsonify
from flask.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.server_groups.servers.databases.schemas.utils \
import SchemaChildModule, DataTypeReader, VacuumSettings, \
trigger_definition, parse_rule_definition

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/__init__.py
View File

@@ -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.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.server_groups.servers.databases.schemas.utils \
import DataTypeReader

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py
View File

@@ -11,7 +11,7 @@
import pgadmin.browser.server_groups.servers.databases as database
from flask import render_template, make_response
from flask.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.utils.ajax import make_json_response, \
make_response as ajax_response

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py
View File

@@ -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.ext.babel import gettext as _
from flask_babel import gettext as _
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.server_groups.servers.databases.schemas.tables.constraints.type \
import ConstraintRegistry

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py
View File

@@ -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.ext.babel import gettext as _
from flask_babel import gettext as _
from pgadmin.browser.server_groups.servers.databases.schemas.tables.constraints.type \
import ConstraintRegistry, ConstraintTypeModule
from pgadmin.browser.utils import PGChildNodeView

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py
View File

@@ -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.ext.babel import gettext as _
from flask_babel import gettext as _
from pgadmin.browser.server_groups.servers.databases.schemas.tables.constraints.type \
import ConstraintRegistry, ConstraintTypeModule
from pgadmin.browser.utils import PGChildNodeView

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py
View File

@@ -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.ext.babel import gettext as _
from flask_babel import gettext as _
from pgadmin.browser.server_groups.servers.databases.schemas.tables.constraints.type \
import ConstraintRegistry, ConstraintTypeModule
from pgadmin.browser.utils import PGChildNodeView

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py
View File

@@ -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.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.utils import PGChildNodeView
from pgadmin.utils.ajax import make_json_response, \

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py
View File

@@ -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.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.server_groups.servers.databases.schemas.utils import \
parse_rule_definition

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py
View File

@@ -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.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.utils import PGChildNodeView
from pgadmin.utils.ajax import make_json_response, \

2
web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py
View File

@@ -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.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.server_groups.servers.databases.schemas.utils \
import SchemaChildModule, DataTypeReader
from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \

2
web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py
View File

@@ -14,7 +14,7 @@ from functools import wraps
import pgadmin.browser.server_groups.servers.databases as databases
import simplejson as json
from flask import render_template, request, jsonify
from flask.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.server_groups.servers.databases.schemas.utils import \
SchemaChildModule, parse_rule_definition, VacuumSettings
from pgadmin.browser.utils import PGChildNodeView

2
web/pgadmin/browser/server_groups/servers/ppas.py
View File

@@ -7,7 +7,7 @@
#
##########################################################################
from flask.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.server_groups.servers.types import ServerType

2
web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py
View File

@@ -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.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.utils import NodeView
from pgadmin.utils.ajax import make_json_response, \

2
web/pgadmin/browser/server_groups/servers/roles/__init__.py
View File

@@ -13,7 +13,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.ext.babel import gettext as _
from flask_babel import gettext as _
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.utils import PGChildNodeView
from pgadmin.utils.ajax import make_json_response, \

2
web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py
View File

@@ -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.ext.babel import gettext
from flask_babel import gettext
from pgadmin.browser.collection import CollectionNodeModule
from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \
parse_priv_to_db

2
web/pgadmin/browser/server_groups/servers/types.py
View File

@@ -10,7 +10,7 @@
import os
from flask import render_template
from flask.ext.babel import gettext as _
from flask_babel import gettext as _
from pgadmin.utils.preferences import Preferences

2
web/pgadmin/browser/utils.py
View File

@@ -13,7 +13,7 @@ from abc import abstractmethod
import flask
from flask import render_template, current_app
from flask.ext.babel import gettext
from flask_babel import gettext
from flask.views import View, MethodViewType, with_metaclass
from pgadmin.utils.ajax import make_json_response, precondition_required

4
web/pgadmin/dashboard/__init__.py
View File

@@ -13,8 +13,8 @@ MODULE_NAME = 'dashboard'
from functools import wraps
from flask import render_template, url_for, Response, g
from flask.ext.babel import gettext
from flask.ext.security import login_required
from flask_babel import gettext
from flask_security import login_required
from pgadmin.utils import PgAdminModule
from pgadmin.utils.ajax import make_response as ajax_response, internal_server_error
from pgadmin.utils.ajax import precondition_required

2
web/pgadmin/help/__init__.py
View File

@@ -11,7 +11,7 @@
MODULE_NAME = 'help'
from flask import url_for
from flask.ext.babel import gettext
from flask_babel import gettext
from pgadmin.utils import PgAdminModule
from pgadmin.utils.menu import MenuItem, Panel
from pgadmin.utils.preferences import Preferences

2
web/pgadmin/misc/__init__.py
View File

@@ -11,7 +11,7 @@
import pgadmin.utils.driver as driver
from flask import url_for, render_template, Response
from flask.ext.babel import gettext as _
from flask_babel import gettext as _
from pgadmin.utils import PgAdminModule
import config

4
web/pgadmin/misc/bgprocess/__init__.py
View File

@@ -12,8 +12,8 @@ A blueprint module providing utility functions for the notify the user about
the long running background-processes.
"""
from flask import url_for
from flask.ext.babel import gettext as _
from flask.ext.security import login_required
from flask_babel import gettext as _
from flask_security import login_required
from pgadmin.utils import PgAdminModule
from pgadmin.utils.ajax import make_response, gone, bad_request, success_return

4
web/pgadmin/misc/bgprocess/processes.py
View File

@@ -24,8 +24,8 @@ from subprocess import Popen, PIPE
import pytz
from dateutil import parser
from flask import current_app as app
from flask.ext.babel import gettext as _
from flask.ext.security import current_user
from flask_babel import gettext as _
from flask_security import current_user
import config
from pgadmin.model import Process, db

4
web/pgadmin/misc/file_manager/__init__.py
View File

@@ -18,8 +18,8 @@ from sys import platform as _platform
import simplejson as json
from flask import render_template, Response, session, request as req, url_for
from flask.ext.babel import gettext
from flask.ext.security import login_required
from flask_babel import gettext
from flask_security import login_required
from pgadmin.utils import PgAdminModule
from pgadmin.utils import get_storage_directory
from pgadmin.utils.ajax import make_json_response

4
web/pgadmin/model/__init__.py
View File

@@ -18,8 +18,8 @@ things:
config database to upgrade it to the new version.
"""
from flask.ext.security import UserMixin, RoleMixin
from flask.ext.sqlalchemy import SQLAlchemy
from flask_security import UserMixin, RoleMixin
from flask_sqlalchemy import SQLAlchemy
##########################################################################
#

6
web/pgadmin/preferences/__init__.py
View File

@@ -15,9 +15,9 @@ side and for getting/setting preferences.
import simplejson as json
from flask import render_template, url_for, Response, request
from flask.ext.babel import gettext
from flask.ext.login import current_user
from flask.ext.security import login_required
from flask_babel import gettext
from flask_login import current_user
from flask_security import login_required
from pgadmin.utils import PgAdminModule
from pgadmin.utils.ajax import success_return, \
make_response as ajax_response, internal_server_error

2
web/pgadmin/redirects/__init__.py
View File

@@ -8,7 +8,7 @@
##########################################################################
from flask import redirect, url_for
from flask.ext.security import login_required
from flask_security import login_required
from pgadmin import PgAdminModule

6
web/pgadmin/settings/__init__.py
View File

@@ -12,9 +12,9 @@
import traceback
from flask import Response, request, render_template, url_for
from flask.ext.babel import gettext
from flask.ext.login import current_user
from flask.ext.security import login_required
from flask_babel import gettext
from flask_login import current_user
from flask_security import login_required
from pgadmin.utils import PgAdminModule
from pgadmin.utils.ajax import make_json_response, bad_request
from pgadmin.utils.menu import MenuItem

2
web/pgadmin/tools/__init__.py
View File

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

4
web/pgadmin/tools/backup/__init__.py
View File

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

4
web/pgadmin/tools/datagrid/__init__.py
View File

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

4
web/pgadmin/tools/debugger/__init__.py
View File

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

4
web/pgadmin/tools/grant_wizard/__init__.py
View File

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

4
web/pgadmin/tools/import_export/__init__.py
View File

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

4
web/pgadmin/tools/maintenance/__init__.py
View File

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

4
web/pgadmin/tools/restore/__init__.py
View File

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

4
web/pgadmin/tools/sqleditor/__init__.py
View File

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

2
web/pgadmin/tools/sqleditor/command.py
View File

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

6
web/pgadmin/tools/user_management/__init__.py
View File

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

2
web/pgadmin/utils/ajax.py
View File

@@ -14,7 +14,7 @@ import decimal
import simplejson as json
from flask import Response
from flask.ext.babel import gettext as _
from flask_babel import gettext as _
class DataTypeJSONEncoder(json.JSONEncoder):

4
web/pgadmin/utils/driver/psycopg2/__init__.py
View File

@@ -23,8 +23,8 @@ import csv
import psycopg2
import psycopg2.extras
from flask import g, current_app, session
from flask.ext.babel import gettext
from flask.ext.security import current_user
from flask_babel import gettext
from flask_security import current_user
from pgadmin.utils.crypto import decrypt
from psycopg2.extensions import adapt

2
web/pgadmin/utils/driver/registry.py
View File

@@ -9,7 +9,7 @@
from abc import ABCMeta
from flask.ext.babel import gettext
from flask_babel import gettext
def _decorate_cls_name(module_name):

2
web/pgadmin/utils/paths.py
View File

@@ -11,7 +11,7 @@
import os
from flask.ext.security import current_user, login_required
from flask_security import current_user, login_required
import config

4
web/pgadmin/utils/preferences.py
View File

@@ -16,8 +16,8 @@ import decimal
import dateutil.parser as dateutil_parser
from flask import current_app
from flask.ext.babel import gettext
from flask.ext.security import current_user
from flask_babel import gettext
from flask_security import current_user
from pgadmin.model import db, Preferences as PrefTable, \
ModulePreference as ModulePrefTable, UserPreference as UserPrefTable, \

4
web/setup.py
View File

@@ -18,8 +18,8 @@ import string
import sys
from flask import Flask
from flask.ext.security import Security, SQLAlchemyUserDatastore
from flask.ext.security.utils import encrypt_password
from flask_security import Security, SQLAlchemyUserDatastore
from flask_security.utils import encrypt_password
from pgadmin.model import db, Role, User, Server, \
ServerGroup, Version