From 39d432ca2cb68eea5b93eddff202c86f26e0748b Mon Sep 17 00:00:00 2001 From: Ashesh Vashi Date: Mon, 29 Feb 2016 23:08:05 +0530 Subject: [PATCH] Remove some unnecessary imports from the pgadmin/__init__.py, and removed the file hooks.py, which is not used any more with new infrastructure. --- web/pgadmin/__init__.py | 4 ++-- web/pgadmin/settings/hooks.py | 16 ---------------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 web/pgadmin/settings/hooks.py diff --git a/web/pgadmin/__init__.py b/web/pgadmin/__init__.py index c360e81f5..0c6f7eda4 100644 --- a/web/pgadmin/__init__.py +++ b/web/pgadmin/__init__.py @@ -16,15 +16,15 @@ from flask.ext.security import Security, SQLAlchemyUserDatastore from flask_security.utils import login_user from flask_mail import Mail from htmlmin.minify import html_minify -from pgadmin.settings.settings_model import db, Role, User, Version +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 os import logging + # Configuration settings import config diff --git a/web/pgadmin/settings/hooks.py b/web/pgadmin/settings/hooks.py deleted file mode 100644 index c64351b84..000000000 --- a/web/pgadmin/settings/hooks.py +++ /dev/null @@ -1,16 +0,0 @@ -########################################################################## -# -# pgAdmin 4 - PostgreSQL Tools -# -# Copyright (C) 2013 - 2016, The pgAdmin Development Team -# This software is released under the PostgreSQL Licence -# -########################################################################## - -"""Browser integration functions for settings.""" - -from flask import url_for - -def get_scripts(): - """Return a list of script URLs to include in the rendered page header""" - return [ url_for('settings.script') ] \ No newline at end of file