diff --git a/web/config.py b/web/config.py index f5b649884..64bed015c 100644 --- a/web/config.py +++ b/web/config.py @@ -11,8 +11,8 @@ # ########################################################################## -from logging import * import os +from logging import * ########################################################################## # Application settings diff --git a/web/pgadmin/__init__.py b/web/pgadmin/__init__.py index f04897e3e..44f0ae5e9 100644 --- a/web/pgadmin/__init__.py +++ b/web/pgadmin/__init__.py @@ -9,24 +9,23 @@ """The main pgAdmin module. This handles the application initialisation tasks, such as setup of logging, dynamic loading of modules etc.""" +import logging +import sys from collections import defaultdict +from importlib import import_module + from flask import Flask, abort, request, current_app from flask.ext.babel import Babel from flask.ext.security import Security, SQLAlchemyUserDatastore -from flask_security.utils import login_user from flask_mail import Mail +from flask_security.utils import login_user from htmlmin.minify import html_minify -from pgadmin.model import db, Role, User, Version -from importlib import import_module -from werkzeug.local import LocalProxy from pgadmin.utils import PgAdminModule, driver -from werkzeug.utils import find_modules -import sys -import logging - from pgadmin.utils.session import ServerSideSessionInterface +from werkzeug.local import LocalProxy +from werkzeug.utils import find_modules - +from pgadmin.model import db, Role, User, Version # Configuration settings import config diff --git a/web/pgadmin/about/__init__.py b/web/pgadmin/about/__init__.py index 64416bc7b..827201826 100644 --- a/web/pgadmin/about/__init__.py +++ b/web/pgadmin/about/__init__.py @@ -10,13 +10,13 @@ """A blueprint module implementing the about box.""" MODULE_NAME = 'about' -from pgadmin.utils import PgAdminModule -from pgadmin.utils.menu import MenuItem -from flask import Response, current_app, render_template, __version__, url_for +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 - -import sys +from pgadmin.utils import PgAdminModule +from pgadmin.utils.menu import MenuItem import config diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py index 8cd356b39..4e80d76f4 100644 --- a/web/pgadmin/browser/__init__.py +++ b/web/pgadmin/browser/__init__.py @@ -7,20 +7,22 @@ # ########################################################################## +import json +import six from abc import ABCMeta, abstractmethod, abstractproperty -from pgadmin import current_blueprint + +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_gravatar import Gravatar +from pgadmin.settings import get_setting from pgadmin.utils import PgAdminModule from pgadmin.utils.ajax import make_json_response from pgadmin.utils.preferences import Preferences -from pgadmin.settings import get_setting -from flask import current_app, render_template, url_for, make_response, flash -from flask.ext.security import login_required -from flask.ext.login import current_user -from flask.ext.babel import gettext -from flask_gravatar import Gravatar -import json, six import config +from pgadmin import current_blueprint try: import urllib.request as urlreq diff --git a/web/pgadmin/browser/collection.py b/web/pgadmin/browser/collection.py index 3cbc977d8..b20519b46 100644 --- a/web/pgadmin/browser/collection.py +++ b/web/pgadmin/browser/collection.py @@ -7,13 +7,14 @@ # ########################################################################## -import six from abc import ABCMeta, abstractmethod + +import six from flask import url_for, render_template from flask.ext.babel import gettext -from pgadmin.utils import PgAdminModule -from pgadmin.browser.utils import PGChildModule from pgadmin.browser import BrowserPluginModule +from pgadmin.browser.utils import PGChildModule +from pgadmin.utils import PgAdminModule from pgadmin.utils.preferences import Preferences diff --git a/web/pgadmin/browser/server_groups/__init__.py b/web/pgadmin/browser/server_groups/__init__.py index 65d41a938..341bec6f2 100644 --- a/web/pgadmin/browser/server_groups/__init__.py +++ b/web/pgadmin/browser/server_groups/__init__.py @@ -8,18 +8,21 @@ ########################################################################## """Defines views for management of server groups""" -from abc import ABCMeta, abstractmethod import json +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 pgadmin.browser import BrowserPluginModule +from pgadmin.browser.utils import NodeView from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response -from pgadmin.browser import BrowserPluginModule from pgadmin.utils.menu import MenuItem + from pgadmin.model import db, ServerGroup -from pgadmin.browser.utils import NodeView -import six + class ServerGroupModule(BrowserPluginModule): diff --git a/web/pgadmin/browser/server_groups/servers/__init__.py b/web/pgadmin/browser/server_groups/servers/__init__.py index a99efc9b2..0e8d7b31a 100644 --- a/web/pgadmin/browser/server_groups/servers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/__init__.py @@ -8,21 +8,24 @@ ########################################################################## import json +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 pgadmin.model import db, Server, ServerGroup, User -from pgadmin.utils.menu import MenuItem +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, \ make_response as ajax_response, internal_server_error, unauthorized, gone -from pgadmin.browser.utils import PGChildNodeView -import traceback -from flask.ext.babel import gettext -import pgadmin.browser.server_groups as sg from pgadmin.utils.crypto import encrypt, decrypt, pqencryptpassword -from config import PG_DEFAULT_DRIVER -from pgadmin.browser.server_groups.servers.types import ServerType +from pgadmin.utils.menu import MenuItem + import config +from config import PG_DEFAULT_DRIVER +from pgadmin.model import db, Server, ServerGroup, User + def has_any(data, keys): """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/__init__.py index a54556577..2175c0a71 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/__init__.py @@ -11,21 +11,23 @@ import json import re +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 pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error, unauthorized -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ - parse_priv_to_db from pgadmin.browser.collection import CollectionNodeModule -import pgadmin.browser.server_groups.servers as servers -from pgadmin.utils.ajax import precondition_required, gone from pgadmin.browser.server_groups.servers.databases.utils import \ parse_sec_labels_from_db, parse_variables_from_db +from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ + parse_priv_to_db +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error, unauthorized +from pgadmin.utils.ajax import precondition_required, gone from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from functools import wraps class DatabaseModule(CollectionNodeModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py index 7b99b7a8a..36037ff35 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py @@ -10,17 +10,20 @@ """Implements Cast Node""" import json -from flask import render_template, make_response, current_app, request, jsonify +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 pgadmin.browser.collection import CollectionNodeModule +from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.browser.collection import CollectionNodeModule -import pgadmin.browser.server_groups.servers.databases as databases from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from functools import wraps + class CastModule(CollectionNodeModule): """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py index b89b2015c..510c9e0ff 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py @@ -9,17 +9,19 @@ import json import re +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 pgadmin.browser.collection import CollectionNodeModule +from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.browser.collection import CollectionNodeModule -import pgadmin.browser.server_groups.servers.databases as database from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from functools import wraps class EventTriggerModule(CollectionNodeModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py index fafe6a11e..26d2ea4c1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py @@ -10,16 +10,18 @@ """ Implements Extension Node """ import json +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 pgadmin.browser.collection import CollectionNodeModule +from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.browser.collection import CollectionNodeModule -import pgadmin.browser.server_groups.servers.databases as databases from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from functools import wraps # As unicode type is not available in python3 # If we check a variable is "isinstance(variable, str) diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py index 371011506..8b8637edc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py @@ -10,19 +10,21 @@ """Implements Foreign Data Wrapper Node""" import json +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 pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.collection import CollectionNodeModule -import pgadmin.browser.server_groups.servers as servers -from pgadmin.utils.ajax import precondition_required -from pgadmin.utils.driver import get_driver -from config import PG_DEFAULT_DRIVER from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ parse_priv_to_db -from functools import wraps +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error +from pgadmin.utils.ajax import precondition_required +from pgadmin.utils.driver import get_driver + +from config import PG_DEFAULT_DRIVER class ForeignDataWrapperModule(CollectionNodeModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py index 958a45578..f38cfef23 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py @@ -10,19 +10,21 @@ """Implements Foreign Server Node""" import json +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 pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.collection import CollectionNodeModule -import pgadmin.browser.server_groups.servers.databases as databases -from pgadmin.utils.ajax import precondition_required -from pgadmin.utils.driver import get_driver -from config import PG_DEFAULT_DRIVER from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ parse_priv_to_db -from functools import wraps +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error +from pgadmin.utils.ajax import precondition_required +from pgadmin.utils.driver import get_driver + +from config import PG_DEFAULT_DRIVER class ForeignServerModule(CollectionNodeModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/__init__.py index ddf2ee1bc..70d0b761d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/__init__.py @@ -10,17 +10,19 @@ """Implements User Mapping Node""" import json +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 pgadmin.browser.collection import CollectionNodeModule +from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.browser.collection import CollectionNodeModule -import pgadmin.browser.server_groups.servers as servers from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from functools import wraps class UserMappingModule(CollectionNodeModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py index defe47963..020b7e2d5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py @@ -12,11 +12,9 @@ import json 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 - -import pgadmin.browser.server_groups.servers.databases as databases -from config import PG_DEFAULT_DRIVER from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ parse_priv_to_db @@ -26,6 +24,8 @@ from pgadmin.utils.ajax import make_json_response, \ from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver +from config import PG_DEFAULT_DRIVER + class LanguageModule(CollectionNodeModule): """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py index bf22d0e7a..bcc6128c1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py @@ -9,20 +9,22 @@ import json import re +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 pgadmin.browser.collection import CollectionNodeModule, PGChildModule +from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ + parse_priv_to_db +from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response, internal_server_error, gone, \ bad_request -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.browser.collection import CollectionNodeModule, PGChildModule -import pgadmin.browser.server_groups.servers as servers from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ - parse_priv_to_db -from functools import wraps """ This module is responsible for generating two nodes diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py index 6437f6ae7..7f4f78691 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py @@ -9,18 +9,20 @@ """ Implements Catalog objects Node.""" +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 pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.server_groups.servers.databases.schemas.utils \ import SchemaChildModule -import pgadmin.browser.server_groups.servers.databases as database +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from functools import wraps class CatalogObjectModule(SchemaChildModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py index 54467ee0f..0e309b895 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py @@ -9,19 +9,21 @@ """ Implements Columns Node (For Catalog objects) """ +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 pgadmin.browser.collection import CollectionNodeModule +from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.browser.collection import CollectionNodeModule -import pgadmin.browser.server_groups.servers.databases as database from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver -from config import PG_DEFAULT_DRIVER -from functools import wraps from pgadmin.utils.preferences import Preferences +from config import PG_DEFAULT_DRIVER + class CatalogObjectColumnsModule(CollectionNodeModule): """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py index c0fa2852f..4d6beaa7b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py @@ -10,18 +10,20 @@ """ Implements Collation Node """ import json +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 pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.server_groups.servers.databases.schemas.utils \ import SchemaChildModule -import pgadmin.browser.server_groups.servers.databases as database +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from functools import wraps class CollationModule(SchemaChildModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py index fbfc11df4..896389b1b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py @@ -10,21 +10,22 @@ """Implements the Domain Node.""" import json +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 pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error, gone -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.browser.collection import CollectionNodeModule -import pgadmin.browser.server_groups.servers.databases as databases -from pgadmin.utils.ajax import precondition_required -from pgadmin.utils.driver import get_driver -from config import PG_DEFAULT_DRIVER from pgadmin.browser.server_groups.servers.databases.schemas.utils import \ SchemaChildModule, DataTypeReader from pgadmin.browser.server_groups.servers.databases.utils import \ parse_sec_labels_from_db -from functools import wraps +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error, gone +from pgadmin.utils.ajax import precondition_required +from pgadmin.utils.driver import get_driver + +from config import PG_DEFAULT_DRIVER class DomainModule(SchemaChildModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py index 6fcfc07a1..192d71470 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py @@ -10,18 +10,20 @@ """Implements the Domain Constraint Module.""" import json -from flask import render_template, make_response, request, jsonify -from flask.ext.babel import gettext -from pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.browser.collection import CollectionNodeModule +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 pgadmin.browser.collection import CollectionNodeModule +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from functools import wraps class DomainConstraintModule(CollectionNodeModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py index a6d52b342..63a8cc001 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py @@ -10,26 +10,27 @@ """Implements the Foreign Table Module.""" import json -from functools import wraps import sys import traceback +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 config import PG_DEFAULT_DRIVER -from pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error, gone -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.browser.collection import CollectionNodeModule -import pgadmin.browser.server_groups.servers.databases as databases -from pgadmin.utils.ajax import precondition_required from pgadmin.browser.server_groups.servers.databases.schemas.utils import \ SchemaChildModule, DataTypeReader -from pgadmin.utils.driver import get_driver from pgadmin.browser.server_groups.servers.databases.utils import \ parse_sec_labels_from_db from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ parse_priv_to_db +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error, gone +from pgadmin.utils.ajax import precondition_required +from pgadmin.utils.driver import get_driver + +from config import PG_DEFAULT_DRIVER class ForeignTableModule(SchemaChildModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py index 44b49c984..600dc7f0b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py @@ -10,18 +10,20 @@ """Defines views for management of Fts Configuration node""" import json +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 pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error, gone -from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.server_groups.servers.databases.schemas.utils \ import SchemaChildModule -import pgadmin.browser.server_groups.servers.databases as databases +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error, gone from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from functools import wraps class FtsConfigurationModule(SchemaChildModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py index 0dbdb8199..58760a2a7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py @@ -10,18 +10,20 @@ """Defines views for management of Fts Dictionary node""" import json +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 pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error, gone -from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.server_groups.servers.databases.schemas.utils \ import SchemaChildModule -import pgadmin.browser.server_groups.servers.databases as databases +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error, gone from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from functools import wraps class FtsDictionaryModule(SchemaChildModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/__init__.py index 86d8ea356..50f2a3058 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/__init__.py @@ -10,17 +10,19 @@ """Defines views for management of FTS Parser node""" import json +from functools import wraps + from flask import render_template, request, jsonify, current_app from flask.ext.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 from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.browser.server_groups.servers.databases.schemas.utils import SchemaChildModule -from pgadmin.browser.server_groups.servers.databases import DatabaseModule from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from functools import wraps class FtsParserModule(SchemaChildModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py index 89330d092..cf226a3d2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py @@ -10,17 +10,19 @@ """Defines views for management of Fts Template node""" import json -from flask import render_template, make_response, current_app, request, jsonify +from functools import wraps + +from flask import render_template, make_response, request, jsonify from flask.ext.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 from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.browser.server_groups.servers.databases.schemas.utils import SchemaChildModule -from pgadmin.browser.server_groups.servers.databases import DatabaseModule from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from functools import wraps class FtsTemplateModule(SchemaChildModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py index 0a41230e2..aef1e0e1a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py @@ -9,29 +9,31 @@ """Implements Functions/Procedures Node.""" +import copy import json +import re import sys import traceback -import copy -import re -from flask import render_template, make_response, request, jsonify, \ - current_app, url_for -from flask.ext.babel import gettext from functools import wraps -from pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error, gone -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.browser.collection import CollectionNodeModule + import pgadmin.browser.server_groups.servers.databases as databases -from pgadmin.utils.ajax import precondition_required -from pgadmin.utils.driver import get_driver -from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ - parse_priv_to_db +from flask import render_template, make_response, request, jsonify, \ + current_app +from flask.ext.babel import gettext from pgadmin.browser.server_groups.servers.databases.schemas.utils import \ SchemaChildModule, DataTypeReader -from config import PG_DEFAULT_DRIVER from pgadmin.browser.server_groups.servers.databases.utils import \ parse_sec_labels_from_db, parse_variables_from_db +from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ + parse_priv_to_db +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error, gone +from pgadmin.utils.ajax import precondition_required +from pgadmin.utils.driver import get_driver + +from config import PG_DEFAULT_DRIVER + class FunctionModule(SchemaChildModule): """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py index d01ba2117..19244a091 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py @@ -10,20 +10,22 @@ """Implements Sequence Node""" import json +from functools import wraps + +import pgadmin.browser.server_groups.servers.databases as database from flask import render_template, make_response, request, jsonify from flask.ext.babel import gettext as _ -from pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ - parse_priv_to_db from pgadmin.browser.server_groups.servers.databases.schemas.utils \ import SchemaChildModule -import pgadmin.browser.server_groups.servers.databases as database +from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ + parse_priv_to_db +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from functools import wraps class SequenceModule(SchemaChildModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py index 93cde7b82..8bb51cd01 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py @@ -11,21 +11,23 @@ import json import re -from flask import render_template, make_response, request, jsonify +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 pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.server_groups.servers.databases.schemas.utils \ import SchemaChildModule, DataTypeReader, VacuumSettings, \ trigger_definition, parse_rule_definition -import pgadmin.browser.server_groups.servers.databases as database -from pgadmin.utils.ajax import precondition_required -from pgadmin.utils.driver import get_driver -from config import PG_DEFAULT_DRIVER from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ parse_priv_to_db -from functools import wraps +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error +from pgadmin.utils.ajax import precondition_required +from pgadmin.utils.driver import get_driver + +from config import PG_DEFAULT_DRIVER class TableModule(SchemaChildModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/__init__.py index 236e28450..b14b9b271 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/__init__.py @@ -9,22 +9,24 @@ """ Implements Column Node """ -from flask import render_template, make_response, request, jsonify +import json +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 pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView +from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.server_groups.servers.databases.schemas.utils \ import DataTypeReader -from pgadmin.browser.collection import CollectionNodeModule -import pgadmin.browser.server_groups.servers.databases as database -from pgadmin.utils.ajax import precondition_required -from pgadmin.utils.driver import get_driver -from config import PG_DEFAULT_DRIVER from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ parse_priv_to_db -from functools import wraps -import json +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error +from pgadmin.utils.ajax import precondition_required +from pgadmin.utils.driver import get_driver + +from config import PG_DEFAULT_DRIVER class ColumnsModule(CollectionNodeModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py index 475c71f58..e01bd5f31 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py @@ -9,12 +9,13 @@ """Implements Constraint Node""" -from flask.ext.babel import gettext -from flask import render_template, make_response -from pgadmin.browser.collection import CollectionNodeModule import pgadmin.browser.server_groups.servers.databases as database +from flask import render_template, make_response +from flask.ext.babel import gettext +from pgadmin.browser.collection import CollectionNodeModule from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response + from .type import ConstraintRegistry diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py index c339453bf..853d51909 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py @@ -10,19 +10,21 @@ """Implements the Check Constraint Module.""" import json +from functools import wraps + +import pgadmin.browser.server_groups.servers.databases as database from flask import render_template, make_response, request, jsonify from flask.ext.babel import gettext as _ +from pgadmin.browser.collection import CollectionNodeModule +from pgadmin.browser.server_groups.servers.databases.schemas.tables.constraints.type \ + import ConstraintRegistry +from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.browser.collection import CollectionNodeModule -import pgadmin.browser.server_groups.servers.databases as database from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from functools import wraps -from pgadmin.browser.server_groups.servers.databases.schemas.tables.constraints.type \ - import ConstraintRegistry, ConstraintTypeModule class CheckConstraintModule(CollectionNodeModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py index cd446429f..09b7c34dd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py @@ -10,18 +10,20 @@ """Implements Exclusion constraint Node""" import json +from functools import wraps + +import pgadmin.browser.server_groups.servers.databases as database from flask import render_template, make_response, request, jsonify from flask.ext.babel import gettext as _ -from pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.utils.ajax import precondition_required -from pgadmin.utils.driver import get_driver -from config import PG_DEFAULT_DRIVER -import pgadmin.browser.server_groups.servers.databases as database -from functools import wraps from pgadmin.browser.server_groups.servers.databases.schemas.tables.constraints.type \ import ConstraintRegistry, ConstraintTypeModule +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error +from pgadmin.utils.ajax import precondition_required +from pgadmin.utils.driver import get_driver + +from config import PG_DEFAULT_DRIVER class ExclusionConstraintModule(ConstraintTypeModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py index 2a3cea98b..b56f679f0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py @@ -10,18 +10,20 @@ """Implements Foreign key constraint Node""" import json +from functools import wraps + +import pgadmin.browser.server_groups.servers.databases as database from flask import render_template, make_response, request, jsonify from flask.ext.babel import gettext as _ -from pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.utils.ajax import precondition_required -from pgadmin.utils.driver import get_driver -from config import PG_DEFAULT_DRIVER -import pgadmin.browser.server_groups.servers.databases as database -from functools import wraps from pgadmin.browser.server_groups.servers.databases.schemas.tables.constraints.type \ import ConstraintRegistry, ConstraintTypeModule +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error +from pgadmin.utils.ajax import precondition_required +from pgadmin.utils.driver import get_driver + +from config import PG_DEFAULT_DRIVER class ForeignKeyConstraintModule(ConstraintTypeModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py index 96b3c3e69..74d5f2402 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py @@ -10,18 +10,20 @@ """Implements Primary key constraint Node""" import json +from functools import wraps + +import pgadmin.browser.server_groups.servers.databases as database from flask import render_template, make_response, request, jsonify from flask.ext.babel import gettext as _ -from pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.utils.ajax import precondition_required -from pgadmin.utils.driver import get_driver -from config import PG_DEFAULT_DRIVER -import pgadmin.browser.server_groups.servers.databases as database -from functools import wraps from pgadmin.browser.server_groups.servers.databases.schemas.tables.constraints.type \ import ConstraintRegistry, ConstraintTypeModule +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error +from pgadmin.utils.ajax import precondition_required +from pgadmin.utils.driver import get_driver + +from config import PG_DEFAULT_DRIVER class IndexConstraintModule(ConstraintTypeModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/type.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/type.py index d75bf2b9c..1f5bee9e8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/type.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/type.py @@ -7,8 +7,8 @@ # ########################################################################## -from pgadmin.browser.collection import CollectionNodeModule from flask import Blueprint +from pgadmin.browser.collection import CollectionNodeModule class ConstraintRegistry(object): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py index 3fe782d38..3afe2cb2d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py @@ -9,20 +9,20 @@ """ Implements Index Node """ -from flask import render_template, make_response, request, jsonify +import json +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 pgadmin.browser.collection import CollectionNodeModule +from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.browser.collection import CollectionNodeModule -import pgadmin.browser.server_groups.servers.databases as database from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ - parse_priv_to_db -from functools import wraps -import json class IndexesModule(CollectionNodeModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py index f442338a8..fd08b6df3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py @@ -10,19 +10,21 @@ """Implements Rule Node""" import json +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 pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView -import pgadmin.browser.server_groups.servers.databases.schemas as schemas +from pgadmin.browser.collection import CollectionNodeModule from pgadmin.browser.server_groups.servers.databases.schemas.utils import \ parse_rule_definition -from pgadmin.browser.collection import CollectionNodeModule +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from functools import wraps class RuleModule(CollectionNodeModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py index 37b139184..ee75bec52 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py @@ -9,20 +9,20 @@ """ Implements Trigger Node """ -from flask import render_template, make_response, request, jsonify +import json +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 pgadmin.browser.collection import CollectionNodeModule +from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.browser.collection import CollectionNodeModule -import pgadmin.browser.server_groups.servers.databases as database -from pgadmin.browser.server_groups.servers.databases.schemas.utils import \ - trigger_definition as _trigger_definition from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from functools import wraps -import json class TriggerModule(CollectionNodeModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py index 33c3a6df8..c438d906b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py @@ -10,20 +10,22 @@ """ Implements Type Node """ import json -from flask import render_template, make_response, request, jsonify +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 pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.server_groups.servers.databases.schemas.utils \ import SchemaChildModule, DataTypeReader -import pgadmin.browser.server_groups.servers.databases as database from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ parse_priv_to_db +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from functools import wraps class TypeModule(SchemaChildModule): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/utils.py index 17a35b67b..70a0dc839 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/utils.py @@ -9,12 +9,13 @@ """Schema collection node helper class""" -from pgadmin.browser.collection import CollectionNodeModule -from pgadmin.browser.utils import PGChildNodeView -from flask import render_template -from pgadmin.utils.ajax import internal_server_error import json +from flask import render_template +from pgadmin.browser.collection import CollectionNodeModule +from pgadmin.utils.ajax import internal_server_error + + class SchemaChildModule(CollectionNodeModule): """ Base class for the schema child node. diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py index 6f3ce9454..d860ea6dd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py @@ -9,21 +9,22 @@ """Implements View and Materialized View Node""" +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 pgadmin.browser.server_groups.servers.databases.schemas.utils import \ + SchemaChildModule, parse_rule_definition, VacuumSettings +from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response, internal_server_error, \ bad_request -from pgadmin.browser.utils import PGChildNodeView -import pgadmin.browser.server_groups.servers.databases as databases -from pgadmin.browser.server_groups.servers.databases.schemas.utils import \ - SchemaChildModule, parse_rule_definition, VacuumSettings from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver -from config import PG_DEFAULT_DRIVER -from functools import wraps +from config import PG_DEFAULT_DRIVER """ This module is responsible for generating two nodes diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/children/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/children/__init__.py index 3993ff3f7..3415171ac 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/children/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/children/__init__.py @@ -2,11 +2,3 @@ We will use the exisiting modules for creating children module under materialize views. """ -from pgadmin.browser.server_groups.servers.databases.schemas.tables.column \ - import blueprint as columns_module -from pgadmin.browser.server_groups.servers.databases.schemas.tables.indexes \ - import blueprint as indexes_modules -from pgadmin.browser.server_groups.servers.databases.schemas.tables.triggers \ - import blueprint as triggers_modules -from pgadmin.browser.server_groups.servers.databases.schemas.tables.rules \ - import blueprint as rules_modules diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py b/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py index 9c0c0f9c1..11a5c880e 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py @@ -10,17 +10,19 @@ """Implements Resource Groups for PPAS 9.4 and above""" import json +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 pgadmin.browser.collection import CollectionNodeModule +from pgadmin.browser.utils import NodeView from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response, internal_server_error -from pgadmin.browser.utils import NodeView -from pgadmin.browser.collection import CollectionNodeModule -import pgadmin.browser.server_groups.servers as servers from pgadmin.utils.ajax import precondition_required from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from functools import wraps class ResourceGroupModule(CollectionNodeModule): diff --git a/web/pgadmin/browser/server_groups/servers/roles/__init__.py b/web/pgadmin/browser/server_groups/servers/roles/__init__.py index 13fc289fc..be39ede8c 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/roles/__init__.py @@ -6,20 +6,22 @@ # This software is released under the PostgreSQL Licence # ########################################################################## +import datetime +import re +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 pgadmin.browser.collection import CollectionNodeModule +from pgadmin.browser.utils import PGChildNodeView from pgadmin.utils.ajax import make_json_response, \ make_response as ajax_response, precondition_required, \ internal_server_error, forbidden, success_return, gone -from pgadmin.browser.utils import PGChildNodeView -from pgadmin.browser.collection import CollectionNodeModule -import pgadmin.browser.server_groups as sg from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -import re -import datetime -from functools import wraps -import simplejson as json class RoleModule(CollectionNodeModule): diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py b/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py index 9c087b468..be547b8aa 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py @@ -8,19 +8,21 @@ ########################################################################## import json import re +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 pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error, gone -from pgadmin.browser.utils import PGChildNodeView from pgadmin.browser.collection import CollectionNodeModule -import pgadmin.browser.server_groups.servers as servers -from pgadmin.utils.ajax import precondition_required -from pgadmin.utils.driver import get_driver -from config import PG_DEFAULT_DRIVER from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \ parse_priv_to_db -from functools import wraps +from pgadmin.browser.utils import PGChildNodeView +from pgadmin.utils.ajax import make_json_response, \ + make_response as ajax_response, internal_server_error, gone +from pgadmin.utils.ajax import precondition_required +from pgadmin.utils.driver import get_driver + +from config import PG_DEFAULT_DRIVER class TablespaceModule(CollectionNodeModule): diff --git a/web/pgadmin/browser/server_groups/servers/types.py b/web/pgadmin/browser/server_groups/servers/types.py index ae38e6452..de6dfe5d4 100644 --- a/web/pgadmin/browser/server_groups/servers/types.py +++ b/web/pgadmin/browser/server_groups/servers/types.py @@ -8,6 +8,7 @@ ########################################################################## import os + from flask import render_template from flask.ext.babel import gettext as _ from pgadmin.utils.preferences import Preferences diff --git a/web/pgadmin/browser/tests/test_change_password.py b/web/pgadmin/browser/tests/test_change_password.py index ca89b4cd4..dedb7d9f0 100644 --- a/web/pgadmin/browser/tests/test_change_password.py +++ b/web/pgadmin/browser/tests/test_change_password.py @@ -7,9 +7,10 @@ # # ########################################################################## +import uuid + from pgadmin.browser.tests.test_login import LoginTestCase from regression.config import config_data -import uuid class ChangePasswordTestCase(LoginTestCase): diff --git a/web/pgadmin/browser/utils.py b/web/pgadmin/browser/utils.py index faf3ae370..05a1bf57b 100644 --- a/web/pgadmin/browser/utils.py +++ b/web/pgadmin/browser/utils.py @@ -10,13 +10,15 @@ """Browser helper utilities""" from abc import abstractmethod + import flask -from flask.views import View, MethodViewType, with_metaclass -from flask.ext.babel import gettext from flask import render_template, current_app -from config import PG_DEFAULT_DRIVER +from flask.ext.babel import gettext +from flask.views import View, MethodViewType, with_metaclass from pgadmin.utils.ajax import make_json_response, precondition_required +from config import PG_DEFAULT_DRIVER + class PGChildModule(object): """ diff --git a/web/pgadmin/dashboard/__init__.py b/web/pgadmin/dashboard/__init__.py index e0411f932..b8eadc0c5 100644 --- a/web/pgadmin/dashboard/__init__.py +++ b/web/pgadmin/dashboard/__init__.py @@ -12,7 +12,6 @@ MODULE_NAME = 'dashboard' from functools import wraps -from config import PG_DEFAULT_DRIVER from flask import render_template, url_for, Response, g from flask.ext.babel import gettext from flask.ext.security import login_required @@ -23,6 +22,8 @@ from pgadmin.utils.driver import get_driver from pgadmin.utils.menu import Panel from pgadmin.utils.preferences import Preferences +from config import PG_DEFAULT_DRIVER + class DashboardModule(PgAdminModule): def __init__(self, *args, **kwargs): diff --git a/web/pgadmin/help/__init__.py b/web/pgadmin/help/__init__.py index 904354a11..9374fb25b 100644 --- a/web/pgadmin/help/__init__.py +++ b/web/pgadmin/help/__init__.py @@ -10,11 +10,12 @@ """A blueprint module implementing the pgAdmin help system.""" MODULE_NAME = 'help' -from pgadmin.utils.preferences import Preferences +from flask import url_for +from flask.ext.babel import gettext from pgadmin.utils import PgAdminModule from pgadmin.utils.menu import MenuItem, Panel -from flask.ext.babel import gettext -from flask import url_for +from pgadmin.utils.preferences import Preferences + import config diff --git a/web/pgadmin/misc/__init__.py b/web/pgadmin/misc/__init__.py index 2081822a6..2d7b89d0b 100644 --- a/web/pgadmin/misc/__init__.py +++ b/web/pgadmin/misc/__init__.py @@ -9,12 +9,12 @@ """A blueprint module providing utility functions for the application.""" +import pgadmin.utils.driver as driver from flask import url_for, render_template, Response from flask.ext.babel import gettext as _ +from pgadmin.utils import PgAdminModule import config -from pgadmin.utils import PgAdminModule -import pgadmin.utils.driver as driver MODULE_NAME = 'misc' diff --git a/web/pgadmin/misc/bgprocess/__init__.py b/web/pgadmin/misc/bgprocess/__init__.py index 8bb4576c3..e3c954d5c 100644 --- a/web/pgadmin/misc/bgprocess/__init__.py +++ b/web/pgadmin/misc/bgprocess/__init__.py @@ -14,9 +14,8 @@ 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 pgadmin.utils.ajax import make_response, gone, bad_request, success_return from pgadmin.utils import PgAdminModule +from pgadmin.utils.ajax import make_response, gone, bad_request, success_return from .processes import BatchProcess diff --git a/web/pgadmin/misc/bgprocess/processes.py b/web/pgadmin/misc/bgprocess/processes.py index deb938fc5..50012fcea 100644 --- a/web/pgadmin/misc/bgprocess/processes.py +++ b/web/pgadmin/misc/bgprocess/processes.py @@ -12,16 +12,17 @@ Introduce a function to run the process executor in detached mode. """ from __future__ import print_function, unicode_literals -from abc import ABCMeta, abstractproperty, abstractmethod -import csv -from datetime import datetime -from dateutil import parser -import os -from pickle import dumps, loads -import pytz -from subprocess import Popen, PIPE -import sys +import csv +import os +import sys +from abc import ABCMeta, abstractproperty, abstractmethod +from datetime import datetime +from pickle import dumps, loads +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 diff --git a/web/pgadmin/misc/depends/__init__.py b/web/pgadmin/misc/depends/__init__.py index 847326e22..d3113952a 100644 --- a/web/pgadmin/misc/depends/__init__.py +++ b/web/pgadmin/misc/depends/__init__.py @@ -9,7 +9,7 @@ """A blueprint module providing utility functions for the application.""" -from flask import session, url_for +from flask import url_for from pgadmin.utils import PgAdminModule MODULE_NAME = 'depends' diff --git a/web/pgadmin/misc/file_manager/__init__.py b/web/pgadmin/misc/file_manager/__init__.py index 968ed4041..d59453082 100644 --- a/web/pgadmin/misc/file_manager/__init__.py +++ b/web/pgadmin/misc/file_manager/__init__.py @@ -9,20 +9,20 @@ """Implements File Manager""" -from pgadmin.utils import PgAdminModule -from flask.ext.babel import gettext -from flask.ext.security import login_required -from flask import render_template, Response, session, request as req, url_for -from pgadmin.utils.ajax import make_json_response -import random import os import os.path -import time -import simplejson as json +import random import string +import time from sys import platform as _platform -from pgadmin.utils import get_storage_directory +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 pgadmin.utils import PgAdminModule +from pgadmin.utils import get_storage_directory +from pgadmin.utils.ajax import make_json_response # Checks if platform is Windows if _platform == "win32": diff --git a/web/pgadmin/model/__init__.py b/web/pgadmin/model/__init__.py index b8bb2560c..1f103389c 100644 --- a/web/pgadmin/model/__init__.py +++ b/web/pgadmin/model/__init__.py @@ -18,8 +18,8 @@ things: config database to upgrade it to the new version. """ -from flask.ext.sqlalchemy import SQLAlchemy from flask.ext.security import UserMixin, RoleMixin +from flask.ext.sqlalchemy import SQLAlchemy db = SQLAlchemy() diff --git a/web/pgadmin/preferences/__init__.py b/web/pgadmin/preferences/__init__.py index ed84b873b..c6726e24b 100644 --- a/web/pgadmin/preferences/__init__.py +++ b/web/pgadmin/preferences/__init__.py @@ -13,19 +13,16 @@ Implements the routes for creating Preferences/Options Dialog on the client 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 pgadmin.utils import PgAdminModule from pgadmin.utils.ajax import success_return, \ make_response as ajax_response, internal_server_error - -from flask import render_template, url_for, Response, request -from flask.ext.security import login_required -from flask.ext.login import current_user -from flask.ext.babel import gettext - from pgadmin.utils.menu import MenuItem from pgadmin.utils.preferences import Preferences -import simplejson as json - MODULE_NAME = 'preferences' diff --git a/web/pgadmin/redirects/__init__.py b/web/pgadmin/redirects/__init__.py index 75ef73d92..f1c3db767 100644 --- a/web/pgadmin/redirects/__init__.py +++ b/web/pgadmin/redirects/__init__.py @@ -7,9 +7,10 @@ # ########################################################################## -from pgadmin import PgAdminModule -from flask.ext.security import login_required from flask import redirect, url_for +from flask.ext.security import login_required + +from pgadmin import PgAdminModule MODULE_NAME = 'redirects' diff --git a/web/pgadmin/settings/__init__.py b/web/pgadmin/settings/__init__.py index 97a34e8a5..a4e9f7ff4 100644 --- a/web/pgadmin/settings/__init__.py +++ b/web/pgadmin/settings/__init__.py @@ -9,17 +9,17 @@ """Utility functions for storing and retrieving user configuration settings.""" +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 pgadmin.utils import PgAdminModule +from pgadmin.utils.ajax import make_json_response, bad_request +from pgadmin.utils.menu import MenuItem from pgadmin.model import db, Setting -import traceback -from flask import Response, request, render_template, url_for -from flask.ext.security import login_required - -from pgadmin.utils.ajax import make_json_response, bad_request -from pgadmin.utils import PgAdminModule -from pgadmin.utils.menu import MenuItem -from flask.ext.babel import gettext MODULE_NAME = 'settings' diff --git a/web/pgadmin/tools/__init__.py b/web/pgadmin/tools/__init__.py index 055c86ec3..6d0e1ab2b 100644 --- a/web/pgadmin/tools/__init__.py +++ b/web/pgadmin/tools/__init__.py @@ -9,9 +9,9 @@ """A blueprint module container for keeping all submodule of type tool.""" +from flask.ext.babel import gettext from pgadmin.utils import PgAdminModule from pgadmin.utils.ajax import bad_request -from flask.ext.babel import gettext MODULE_NAME = 'tools' diff --git a/web/pgadmin/tools/backup/__init__.py b/web/pgadmin/tools/backup/__init__.py index cf583403c..a217e1c9d 100644 --- a/web/pgadmin/tools/backup/__init__.py +++ b/web/pgadmin/tools/backup/__init__.py @@ -16,13 +16,12 @@ 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 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 from config import PG_DEFAULT_DRIVER -from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc from pgadmin.model import Server -from pgadmin.utils.ajax import make_json_response, bad_request -from pgadmin.utils import PgAdminModule, get_storage_directory, html - # set template path for sql scripts MODULE_NAME = 'backup' diff --git a/web/pgadmin/tools/datagrid/__init__.py b/web/pgadmin/tools/datagrid/__init__.py index 78c1ee734..cb99982df 100644 --- a/web/pgadmin/tools/datagrid/__init__.py +++ b/web/pgadmin/tools/datagrid/__init__.py @@ -10,9 +10,10 @@ """A blueprint module implementing the datagrid frame.""" MODULE_NAME = 'datagrid' +import json import pickle import random -import json + from flask import Response, url_for, session, request, make_response from flask.ext.babel import gettext from flask.ext.security import login_required @@ -20,8 +21,10 @@ from pgadmin.tools.sqleditor.command import * from pgadmin.utils import PgAdminModule from pgadmin.utils.ajax import make_json_response, bad_request,\ internal_server_error + from config import PG_DEFAULT_DRIVER + class DataGridModule(PgAdminModule): """ class DataGridModule(PgAdminModule) diff --git a/web/pgadmin/tools/debugger/__init__.py b/web/pgadmin/tools/debugger/__init__.py index 4bd7094a3..b2a7cefab 100644 --- a/web/pgadmin/tools/debugger/__init__.py +++ b/web/pgadmin/tools/debugger/__init__.py @@ -13,17 +13,18 @@ MODULE_NAME = 'debugger' import json import random -from flask import url_for, Response, render_template, request, make_response, jsonify, session, current_app -from pgadmin.utils import PgAdminModule -from pgadmin.utils.ajax import bad_request + +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 pgadmin.utils import PgAdminModule +from pgadmin.utils.ajax import bad_request +from pgadmin.utils.ajax import make_json_response, \ + internal_server_error from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER from pgadmin.model import db, DebuggerFunctionArguments -from pgadmin.utils.ajax import make_json_response, \ - make_response as ajax_response, internal_server_error -from pgadmin.utils.menu import Panel # Constants ASYNC_OK = 1 diff --git a/web/pgadmin/tools/grant_wizard/__init__.py b/web/pgadmin/tools/grant_wizard/__init__.py index ca8ee40a9..cb69905bd 100644 --- a/web/pgadmin/tools/grant_wizard/__init__.py +++ b/web/pgadmin/tools/grant_wizard/__init__.py @@ -10,16 +10,18 @@ """Implements Grant Wizard""" 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 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, \ make_json_response, internal_server_error from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -from pgadmin.browser.server_groups.servers.utils import parse_priv_to_db -from pgadmin.utils import PgAdminModule -from flask import Response, url_for -from flask.ext.security import login_required + try: from urllib import unquote except: diff --git a/web/pgadmin/tools/import_export/__init__.py b/web/pgadmin/tools/import_export/__init__.py index 25dd5c490..a3fe1be4b 100644 --- a/web/pgadmin/tools/import_export/__init__.py +++ b/web/pgadmin/tools/import_export/__init__.py @@ -15,12 +15,12 @@ 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 config import PG_DEFAULT_DRIVER +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 + +from config import PG_DEFAULT_DRIVER from pgadmin.model import Server -from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc MODULE_NAME = 'import_export' diff --git a/web/pgadmin/tools/maintenance/__init__.py b/web/pgadmin/tools/maintenance/__init__.py index 151f242ff..60b3911a9 100644 --- a/web/pgadmin/tools/maintenance/__init__.py +++ b/web/pgadmin/tools/maintenance/__init__.py @@ -14,14 +14,14 @@ 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 config import PG_DEFAULT_DRIVER from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc -from pgadmin.model import Server from pgadmin.utils import PgAdminModule, html from pgadmin.utils.ajax import bad_request, make_json_response from pgadmin.utils.driver import get_driver +from config import PG_DEFAULT_DRIVER +from pgadmin.model import Server + MODULE_NAME = 'maintenance' diff --git a/web/pgadmin/tools/restore/__init__.py b/web/pgadmin/tools/restore/__init__.py index b1458dc94..d6a1170e8 100644 --- a/web/pgadmin/tools/restore/__init__.py +++ b/web/pgadmin/tools/restore/__init__.py @@ -14,14 +14,14 @@ import os from flask import render_template, request, current_app, \ url_for, Response -from flask.ext.security import login_required, current_user from flask.ext.babel import gettext as _ +from flask.ext.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 from config import PG_DEFAULT_DRIVER from pgadmin.model import Server -from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc -from pgadmin.utils.ajax import make_json_response, bad_request -from pgadmin.utils import PgAdminModule, get_storage_directory, html # set template path for sql scripts MODULE_NAME = 'restore' diff --git a/web/pgadmin/tools/sqleditor/__init__.py b/web/pgadmin/tools/sqleditor/__init__.py index 5435bf7dd..66f513291 100644 --- a/web/pgadmin/tools/sqleditor/__init__.py +++ b/web/pgadmin/tools/sqleditor/__init__.py @@ -11,21 +11,23 @@ MODULE_NAME = 'sqleditor' import json +import os import pickle import random -import os + from flask import Response, url_for, render_template, session, request from flask.ext.babel import gettext from flask.ext.security import login_required +from pgadmin.tools.sqleditor.command import QueryToolCommand from pgadmin.utils import PgAdminModule +from pgadmin.utils import get_storage_directory from pgadmin.utils.ajax import make_json_response, bad_request, \ success_return, internal_server_error from pgadmin.utils.driver import get_driver -from config import PG_DEFAULT_DRIVER -from pgadmin.tools.sqleditor.command import QueryToolCommand -from pgadmin.utils import get_storage_directory from pgadmin.utils.sqlautocomplete.autocomplete import SQLAutoComplete +from config import PG_DEFAULT_DRIVER + # import unquote from urlib for python2.x and python3.x try: from urllib import unquote diff --git a/web/pgadmin/tools/sqleditor/command.py b/web/pgadmin/tools/sqleditor/command.py index 68e0f43c0..a6c4f79e8 100644 --- a/web/pgadmin/tools/sqleditor/command.py +++ b/web/pgadmin/tools/sqleditor/command.py @@ -10,12 +10,14 @@ """ Implemented classes for the different object type used by data grid """ from abc import ABCMeta, abstractmethod + +import six from flask import render_template from flask.ext.babel import gettext -from pgadmin.utils.driver import get_driver from pgadmin.utils.ajax import forbidden +from pgadmin.utils.driver import get_driver + from config import PG_DEFAULT_DRIVER -import six VIEW_FIRST_100_ROWS = 1 VIEW_LAST_100_ROWS = 2 diff --git a/web/pgadmin/tools/user_management/__init__.py b/web/pgadmin/tools/user_management/__init__.py index 85d61d94b..44db77f89 100644 --- a/web/pgadmin/tools/user_management/__init__.py +++ b/web/pgadmin/tools/user_management/__init__.py @@ -16,13 +16,13 @@ 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 pgadmin.utils import PgAdminModule from pgadmin.utils.ajax import make_response as ajax_response,\ make_json_response, bad_request, internal_server_error -from pgadmin.utils import PgAdminModule + from pgadmin.model import db, Role, User, UserPreference, Server,\ ServerGroup, Process, Setting -from flask.ext.security.utils import encrypt_password # set template path for sql scripts MODULE_NAME = 'user_management' diff --git a/web/pgadmin/utils/__init__.py b/web/pgadmin/utils/__init__.py index c30d5bb60..82a7cb965 100644 --- a/web/pgadmin/utils/__init__.py +++ b/web/pgadmin/utils/__init__.py @@ -7,11 +7,13 @@ # ########################################################################## -from flask import Blueprint from collections import defaultdict from operator import attrgetter -from .preferences import Preferences + +from flask import Blueprint + from .paths import get_storage_directory +from .preferences import Preferences class PgAdminModule(Blueprint): diff --git a/web/pgadmin/utils/ajax.py b/web/pgadmin/utils/ajax.py index 603e06da5..1df807649 100644 --- a/web/pgadmin/utils/ajax.py +++ b/web/pgadmin/utils/ajax.py @@ -9,12 +9,13 @@ """Utility functions for dealing with AJAX.""" -from flask import Response -from flask.ext.babel import gettext as _ -import simplejson as json import datetime import decimal +import simplejson as json +from flask import Response +from flask.ext.babel import gettext as _ + class DataTypeJSONEncoder(json.JSONEncoder): def default(self, obj): diff --git a/web/pgadmin/utils/crypto.py b/web/pgadmin/utils/crypto.py index 3301eef1b..593b0d026 100644 --- a/web/pgadmin/utils/crypto.py +++ b/web/pgadmin/utils/crypto.py @@ -9,11 +9,12 @@ """This File Provides Cryptography.""" -from Crypto.Cipher import AES -from Crypto import Random import base64 import hashlib +from Crypto import Random +from Crypto.Cipher import AES + padding_string = b'}' diff --git a/web/pgadmin/utils/driver/__init__.py b/web/pgadmin/utils/driver/__init__.py index 17daabf44..5c3555b0a 100644 --- a/web/pgadmin/utils/driver/__init__.py +++ b/web/pgadmin/utils/driver/__init__.py @@ -8,6 +8,7 @@ ########################################################################## from flask import current_app + from .registry import DriverRegistry diff --git a/web/pgadmin/utils/driver/abstract.py b/web/pgadmin/utils/driver/abstract.py index 2ddc7dd9c..19d1e261e 100644 --- a/web/pgadmin/utils/driver/abstract.py +++ b/web/pgadmin/utils/driver/abstract.py @@ -10,9 +10,11 @@ """Implement the Base class for Driver and Connection""" from abc import ABCMeta, abstractmethod, abstractproperty -from .registry import DriverRegistry + import six +from .registry import DriverRegistry + @six.add_metaclass(DriverRegistry) class BaseDriver(object): diff --git a/web/pgadmin/utils/driver/psycopg2/__init__.py b/web/pgadmin/utils/driver/psycopg2/__init__.py index 17f477d01..2046e9512 100644 --- a/web/pgadmin/utils/driver/psycopg2/__init__.py +++ b/web/pgadmin/utils/driver/psycopg2/__init__.py @@ -20,18 +20,16 @@ import select import psycopg2 import psycopg2.extras -from psycopg2.extensions import adapt - from flask import g, current_app, session from flask.ext.babel import gettext from flask.ext.security import current_user +from pgadmin.utils.crypto import decrypt +from psycopg2.extensions import adapt import config from pgadmin.model import Server, User -from pgadmin.utils.crypto import decrypt -from ..abstract import BaseDriver, BaseConnection from .keywords import ScanKeyword - +from ..abstract import BaseDriver, BaseConnection _ = gettext diff --git a/web/pgadmin/utils/driver/psycopg2/generate_keywords.py b/web/pgadmin/utils/driver/psycopg2/generate_keywords.py index 4f38ea14d..0aef41a3a 100644 --- a/web/pgadmin/utils/driver/psycopg2/generate_keywords.py +++ b/web/pgadmin/utils/driver/psycopg2/generate_keywords.py @@ -13,8 +13,8 @@ # ########################################################################## -import re import os +import re if __name__ == '__main__': include_dir = os.popen('pg_config --includedir').read().rstrip() diff --git a/web/pgadmin/utils/driver/registry.py b/web/pgadmin/utils/driver/registry.py index 16e301392..a94194504 100644 --- a/web/pgadmin/utils/driver/registry.py +++ b/web/pgadmin/utils/driver/registry.py @@ -8,6 +8,7 @@ ########################################################################## from abc import ABCMeta + from flask.ext.babel import gettext diff --git a/web/pgadmin/utils/menu.py b/web/pgadmin/utils/menu.py index 8de39a6b5..64d41c7fe 100644 --- a/web/pgadmin/utils/menu.py +++ b/web/pgadmin/utils/menu.py @@ -7,8 +7,6 @@ # ########################################################################## -from collections import namedtuple - PRIORITY = 100 class MenuItem(object): diff --git a/web/pgadmin/utils/paths.py b/web/pgadmin/utils/paths.py index e861baee5..3f246e6e8 100644 --- a/web/pgadmin/utils/paths.py +++ b/web/pgadmin/utils/paths.py @@ -10,7 +10,9 @@ """This file contains functions fetching different utility paths.""" import os + from flask.ext.security import current_user, login_required + import config diff --git a/web/pgadmin/utils/preferences.py b/web/pgadmin/utils/preferences.py index 00e4fd154..b966a6d2b 100644 --- a/web/pgadmin/utils/preferences.py +++ b/web/pgadmin/utils/preferences.py @@ -12,14 +12,16 @@ Utility classes to register, getter, setter functions for the preferences of a module within the system. """ +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 pgadmin.model import db, Preferences as PrefTable, \ ModulePreference as ModulePrefTable, UserPreference as UserPrefTable, \ PreferenceCategory as PrefCategoryTbl -from flask.ext.babel import gettext -import dateutil.parser as dateutil_parser -import decimal class _Preference(object): diff --git a/web/pgadmin/utils/route.py b/web/pgadmin/utils/route.py index 1ff41def0..fb9de6996 100644 --- a/web/pgadmin/utils/route.py +++ b/web/pgadmin/utils/route.py @@ -7,8 +7,8 @@ # ############################################################## -from abc import ABCMeta, abstractmethod import unittest +from abc import ABCMeta, abstractmethod class TestsGeneratorRegistry(ABCMeta): diff --git a/web/pgadmin/utils/session.py b/web/pgadmin/utils/session.py index ae404bac8..a70cb20cb 100644 --- a/web/pgadmin/utils/session.py +++ b/web/pgadmin/utils/session.py @@ -15,10 +15,11 @@ Credit/Reference: http://flask.pocoo.org/snippets/86/ Modified to support both Python 2.6+ & Python 3.x """ -import os import errno +import os import sqlite3 from uuid import uuid4 + try: from cPickle import dumps, loads except: diff --git a/web/pgadmin/utils/sqlautocomplete/autocomplete.py b/web/pgadmin/utils/sqlautocomplete/autocomplete.py index 9ac002160..24feca873 100644 --- a/web/pgadmin/utils/sqlautocomplete/autocomplete.py +++ b/web/pgadmin/utils/sqlautocomplete/autocomplete.py @@ -9,21 +9,23 @@ """A blueprint module implementing the sql auto complete feature.""" -import sys -import re -import sqlparse import itertools import operator +import re +import sys from collections import namedtuple + +import sqlparse +from flask import render_template +from pgadmin.utils.driver import get_driver from sqlparse.sql import Comparison, Identifier, Where + +from config import PG_DEFAULT_DRIVER +from .completion import Completion +from .function_metadata import FunctionMetadata from .parseutils import ( last_word, extract_tables, find_prev_keyword, parse_partial_identifier) from .prioritization import PrevalenceCounter -from .completion import Completion -from .function_metadata import FunctionMetadata -from flask import render_template -from pgadmin.utils.driver import get_driver -from config import PG_DEFAULT_DRIVER PY2 = sys.version_info[0] == 2 PY3 = sys.version_info[0] == 3 diff --git a/web/pgadmin/utils/sqlautocomplete/completion.py b/web/pgadmin/utils/sqlautocomplete/completion.py index cea14b5da..a20feb1c9 100644 --- a/web/pgadmin/utils/sqlautocomplete/completion.py +++ b/web/pgadmin/utils/sqlautocomplete/completion.py @@ -4,8 +4,6 @@ Using Completion class from """ from __future__ import unicode_literals -from abc import ABCMeta, abstractmethod -from six import with_metaclass __all__ = ( 'Completion' diff --git a/web/pgadmin/utils/sqlautocomplete/counter.py b/web/pgadmin/utils/sqlautocomplete/counter.py index 4dc896a14..f52c295f0 100644 --- a/web/pgadmin/utils/sqlautocomplete/counter.py +++ b/web/pgadmin/utils/sqlautocomplete/counter.py @@ -2,9 +2,9 @@ Copied from http://code.activestate.com/recipes/576611-counter-class/ """ -from operator import itemgetter from heapq import nlargest from itertools import repeat, ifilter +from operator import itemgetter class Counter(dict): diff --git a/web/pgadmin/utils/sqlautocomplete/function_metadata.py b/web/pgadmin/utils/sqlautocomplete/function_metadata.py index d11f33b58..858d6a8f4 100644 --- a/web/pgadmin/utils/sqlautocomplete/function_metadata.py +++ b/web/pgadmin/utils/sqlautocomplete/function_metadata.py @@ -1,8 +1,8 @@ import re + import sqlparse from sqlparse.tokens import Whitespace, Comment, Keyword, Name, Punctuation - table_def_regex = re.compile(r'^TABLE\s*\((.+)\)$', re.IGNORECASE) diff --git a/web/pgadmin/utils/sqlautocomplete/parseutils.py b/web/pgadmin/utils/sqlautocomplete/parseutils.py index 61f3cdc14..672d1cac7 100644 --- a/web/pgadmin/utils/sqlautocomplete/parseutils.py +++ b/web/pgadmin/utils/sqlautocomplete/parseutils.py @@ -1,7 +1,7 @@ - import re -import sqlparse from collections import namedtuple + +import sqlparse from sqlparse.sql import IdentifierList, Identifier, Function from sqlparse.tokens import Keyword, DML, Punctuation, Token, Error diff --git a/web/pgadmin/utils/sqlautocomplete/prioritization.py b/web/pgadmin/utils/sqlautocomplete/prioritization.py index c9c99e0d9..616868e49 100644 --- a/web/pgadmin/utils/sqlautocomplete/prioritization.py +++ b/web/pgadmin/utils/sqlautocomplete/prioritization.py @@ -1,7 +1,8 @@ import re +from collections import defaultdict + import sqlparse from sqlparse.tokens import Name -from collections import defaultdict white_space_regex = re.compile('\\s+', re.MULTILINE) diff --git a/web/regression/testsuite.py b/web/regression/testsuite.py index 9ec7ffef6..6e6fb0cbf 100644 --- a/web/regression/testsuite.py +++ b/web/regression/testsuite.py @@ -13,6 +13,7 @@ them to TestSuite. """ import os import sys import unittest + from testscenarios.scenarios import generate_scenarios # We need to include the root directory in sys.path to ensure that we can diff --git a/web/setup.py b/web/setup.py index e1da55c8b..c9f46e6f3 100644 --- a/web/setup.py +++ b/web/setup.py @@ -10,19 +10,19 @@ """Perform the initial setup of the application, by creating the auth and settings database.""" -import os -import sys import getpass +import os import random -import string import re +import string +import sys from flask import Flask from flask.ext.security import Security, SQLAlchemyUserDatastore from flask.ext.security.utils import encrypt_password + from pgadmin.model import db, Role, User, Server, \ ServerGroup, Version - # Configuration settings import config