From 694506453b830fc60b98ea2382ea0a5bcd0331a0 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Mon, 18 Jan 2016 14:48:14 +0000 Subject: [PATCH] Copyright updates for 2016. --- LICENSE | 2 +- web/config.py | 4 ++-- web/pgAdmin4.py | 2 +- web/pgadmin/__init__.py | 2 +- web/pgadmin/about/__init__.py | 2 +- web/pgadmin/browser/__init__.py | 3 ++- web/pgadmin/browser/collection.py | 2 +- web/pgadmin/browser/server_groups/__init__.py | 2 +- web/pgadmin/browser/server_groups/servers/__init__.py | 3 ++- web/pgadmin/browser/server_groups/servers/ppas.py | 3 ++- web/pgadmin/browser/server_groups/servers/types.py | 3 ++- web/pgadmin/browser/utils.py | 2 +- web/pgadmin/help/__init__.py | 2 +- web/pgadmin/misc/__init__.py | 2 +- web/pgadmin/redirects/__init__.py | 2 +- web/pgadmin/settings/__init__.py | 2 +- web/pgadmin/settings/hooks.py | 2 +- web/pgadmin/settings/settings_model.py | 2 +- web/pgadmin/test/__init__.py | 2 +- web/pgadmin/utils/__init__.py | 2 +- web/pgadmin/utils/ajax.py | 2 +- web/pgadmin/utils/crypto.py | 3 ++- web/pgadmin/utils/driver/__init__.py | 9 +++++++++ web/pgadmin/utils/driver/abstract.py | 3 ++- web/pgadmin/utils/driver/psycopg2/__init__.py | 3 ++- web/pgadmin/utils/driver/psycopg2/generate_keywords.py | 5 +++-- web/pgadmin/utils/driver/psycopg2/keywords.py | 3 ++- web/pgadmin/utils/driver/registry.py | 3 ++- web/pgadmin/utils/menu.py | 2 +- web/setup.py | 2 +- 30 files changed, 50 insertions(+), 31 deletions(-) diff --git a/LICENSE b/LICENSE index bff69f980..88642049a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ pgAdmin 4 -Copyright (c) 2013, The pgAdmin Development Team +Copyright (c) 2013 - 2016, The pgAdmin Development Team Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is diff --git a/web/config.py b/web/config.py index 968bc3d51..b4b0e0086 100644 --- a/web/config.py +++ b/web/config.py @@ -4,7 +4,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # # config.py - Core application configuration settings @@ -32,7 +32,7 @@ APP_REVISION = 0 APP_SUFFIX = 'dev' # Copyright string for display in the app -APP_COPYRIGHT = 'Copyright 2014 - 2015, The pgAdmin Development Team' +APP_COPYRIGHT = 'Copyright 2013 - 2016, The pgAdmin Development Team' # Path to the online help. HELP_PATH = '../../../docs/en_US/_build/html/' diff --git a/web/pgAdmin4.py b/web/pgAdmin4.py index fdab437ba..977d4e861 100644 --- a/web/pgAdmin4.py +++ b/web/pgAdmin4.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/__init__.py b/web/pgadmin/__init__.py index 890aff51b..884f7bd90 100644 --- a/web/pgadmin/__init__.py +++ b/web/pgadmin/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/about/__init__.py b/web/pgadmin/about/__init__.py index eab615b35..64416bc7b 100644 --- a/web/pgadmin/about/__init__.py +++ b/web/pgadmin/about/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py index af4c39ee9..568a3d24d 100644 --- a/web/pgadmin/browser/__init__.py +++ b/web/pgadmin/browser/__init__.py @@ -2,10 +2,11 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## + from abc import ABCMeta, abstractmethod, abstractproperty from pgadmin import current_blueprint from pgadmin.utils import PgAdminModule diff --git a/web/pgadmin/browser/collection.py b/web/pgadmin/browser/collection.py index 4c6753622..cf121e7ca 100644 --- a/web/pgadmin/browser/collection.py +++ b/web/pgadmin/browser/collection.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/__init__.py b/web/pgadmin/browser/server_groups/__init__.py index c95416dd0..9de5d1d9d 100644 --- a/web/pgadmin/browser/server_groups/__init__.py +++ b/web/pgadmin/browser/server_groups/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/server_groups/servers/__init__.py b/web/pgadmin/browser/server_groups/servers/__init__.py index 04156ee2b..b18dfe0e8 100644 --- a/web/pgadmin/browser/server_groups/servers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/__init__.py @@ -2,10 +2,11 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## + import json from abc import ABCMeta, abstractmethod, abstractproperty from flask import render_template, request, make_response, jsonify, \ diff --git a/web/pgadmin/browser/server_groups/servers/ppas.py b/web/pgadmin/browser/server_groups/servers/ppas.py index a08b92468..1642c4b77 100644 --- a/web/pgadmin/browser/server_groups/servers/ppas.py +++ b/web/pgadmin/browser/server_groups/servers/ppas.py @@ -2,10 +2,11 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## + from flask.ext.babel import gettext from pgadmin.browser.server_groups.servers.types import ServerType diff --git a/web/pgadmin/browser/server_groups/servers/types.py b/web/pgadmin/browser/server_groups/servers/types.py index 33905d113..294844f4f 100644 --- a/web/pgadmin/browser/server_groups/servers/types.py +++ b/web/pgadmin/browser/server_groups/servers/types.py @@ -2,10 +2,11 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## + import six from abc import ABCMeta, abstractmethod, abstractproperty from flask import render_template diff --git a/web/pgadmin/browser/utils.py b/web/pgadmin/browser/utils.py index d579692f3..408003b14 100644 --- a/web/pgadmin/browser/utils.py +++ b/web/pgadmin/browser/utils.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/help/__init__.py b/web/pgadmin/help/__init__.py index 865beb610..db48063ff 100644 --- a/web/pgadmin/help/__init__.py +++ b/web/pgadmin/help/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/misc/__init__.py b/web/pgadmin/misc/__init__.py index 0efed0002..f461cbeee 100644 --- a/web/pgadmin/misc/__init__.py +++ b/web/pgadmin/misc/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/redirects/__init__.py b/web/pgadmin/redirects/__init__.py index c9a76d35a..641edaf46 100644 --- a/web/pgadmin/redirects/__init__.py +++ b/web/pgadmin/redirects/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/settings/__init__.py b/web/pgadmin/settings/__init__.py index 2cbbf32f6..bf4c32c36 100644 --- a/web/pgadmin/settings/__init__.py +++ b/web/pgadmin/settings/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/settings/hooks.py b/web/pgadmin/settings/hooks.py index 7bdba3dda..c64351b84 100644 --- a/web/pgadmin/settings/hooks.py +++ b/web/pgadmin/settings/hooks.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/settings/settings_model.py b/web/pgadmin/settings/settings_model.py index bbc6537d3..4a13f9516 100644 --- a/web/pgadmin/settings/settings_model.py +++ b/web/pgadmin/settings/settings_model.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/test/__init__.py b/web/pgadmin/test/__init__.py index 9bfe54158..c8ded795e 100644 --- a/web/pgadmin/test/__init__.py +++ b/web/pgadmin/test/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/utils/__init__.py b/web/pgadmin/utils/__init__.py index 337477c5f..95f02b5d6 100644 --- a/web/pgadmin/utils/__init__.py +++ b/web/pgadmin/utils/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/utils/ajax.py b/web/pgadmin/utils/ajax.py index 32fc9cf68..ce9f2dcd0 100644 --- a/web/pgadmin/utils/ajax.py +++ b/web/pgadmin/utils/ajax.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/utils/crypto.py b/web/pgadmin/utils/crypto.py index efe5905ae..98411a651 100644 --- a/web/pgadmin/utils/crypto.py +++ b/web/pgadmin/utils/crypto.py @@ -2,10 +2,11 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ######################################################################### + """This File Provides Cryptography.""" from Crypto.Cipher import AES diff --git a/web/pgadmin/utils/driver/__init__.py b/web/pgadmin/utils/driver/__init__.py index 5cd7256fd..17daabf44 100644 --- a/web/pgadmin/utils/driver/__init__.py +++ b/web/pgadmin/utils/driver/__init__.py @@ -1,3 +1,12 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2016, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + 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 2fba2698f..d6eb5f94a 100644 --- a/web/pgadmin/utils/driver/abstract.py +++ b/web/pgadmin/utils/driver/abstract.py @@ -2,10 +2,11 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## + from abc import ABCMeta, abstractmethod, abstractproperty from flask import session from .registry import DriverRegistry diff --git a/web/pgadmin/utils/driver/psycopg2/__init__.py b/web/pgadmin/utils/driver/psycopg2/__init__.py index 3fed8d00c..3cf4bab2c 100644 --- a/web/pgadmin/utils/driver/psycopg2/__init__.py +++ b/web/pgadmin/utils/driver/psycopg2/__init__.py @@ -2,10 +2,11 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## + from datetime import datetime import psycopg2 diff --git a/web/pgadmin/utils/driver/psycopg2/generate_keywords.py b/web/pgadmin/utils/driver/psycopg2/generate_keywords.py index 6335c7393..cdaba4df2 100644 --- a/web/pgadmin/utils/driver/psycopg2/generate_keywords.py +++ b/web/pgadmin/utils/driver/psycopg2/generate_keywords.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # # This allows us to generate to keywords.py for PostgreSQL for used by @@ -12,6 +12,7 @@ # pg_config executable in the PATH. # ########################################################################## + import re import os @@ -25,7 +26,7 @@ if __name__ == '__main__': # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/utils/driver/psycopg2/keywords.py b/web/pgadmin/utils/driver/psycopg2/keywords.py index 9f057ab24..994d0d740 100644 --- a/web/pgadmin/utils/driver/psycopg2/keywords.py +++ b/web/pgadmin/utils/driver/psycopg2/keywords.py @@ -2,10 +2,11 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## + # ScanKeyword function for PostgreSQL 9.5rc1 def ScanKeyword(key): diff --git a/web/pgadmin/utils/driver/registry.py b/web/pgadmin/utils/driver/registry.py index 4244e67f8..659aa76a0 100644 --- a/web/pgadmin/utils/driver/registry.py +++ b/web/pgadmin/utils/driver/registry.py @@ -2,10 +2,11 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## + 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 e1e1df0f1..2658f0f97 100644 --- a/web/pgadmin/utils/menu.py +++ b/web/pgadmin/utils/menu.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/setup.py b/web/setup.py index 7c46cd603..ae47ac34d 100644 --- a/web/setup.py +++ b/web/setup.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2015, The pgAdmin Development Team +# Copyright (C) 2013 - 2016, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ##########################################################################