diff --git a/docs/en_US/coding-standards.rst b/docs/en_US/coding-standards.rst index 021184fec..1eb86d723 100644 --- a/docs/en_US/coding-standards.rst +++ b/docs/en_US/coding-standards.rst @@ -156,8 +156,9 @@ Python Python is used for the backend web server. All code must be compatible with Python 2.7 and should include PyDoc comments whilst following the official -Python coding standards. An example function along with the file header is -shown below:: +Python coding standards defined in +`PEP 8 `_. An example function along +with the required file header is shown below:: ########################################################################## # @@ -181,7 +182,9 @@ shown below:: value = '' for group in groups: - value += '{"id":%d,"label":"%s","icon":"icon-server-group","inode":true},' % (group.id, group.name) + value += '{"id":%d,"label":"%s","icon":"icon-server-group","inode":true},' \ + % (group.id, group.name) + value = value[:-1] return value \ No newline at end of file diff --git a/web/config.py b/web/config.py index f2f3a980d..8398da156 100644 --- a/web/config.py +++ b/web/config.py @@ -4,7 +4,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2014, The pgAdmin Development Team +# Copyright (C) 2013 - 2015, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # # config.py - Core application configuration settings diff --git a/web/pgAdmin4.py b/web/pgAdmin4.py index b89c9a642..f3ad36ec4 100644 --- a/web/pgAdmin4.py +++ b/web/pgAdmin4.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2014, The pgAdmin Development Team +# Copyright (C) 2013 - 2015, 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 05cfde7c4..b417bf3c9 100644 --- a/web/pgadmin/__init__.py +++ b/web/pgadmin/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2014, The pgAdmin Development Team +# Copyright (C) 2013 - 2015, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/about/views.py b/web/pgadmin/about/views.py index 0feed10cd..0966a16e7 100644 --- a/web/pgadmin/about/views.py +++ b/web/pgadmin/about/views.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2014, The pgAdmin Development Team +# Copyright (C) 2013 - 2015, 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 50115f062..f29c21290 100644 --- a/web/pgadmin/browser/__init__.py +++ b/web/pgadmin/browser/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2014, The pgAdmin Development Team +# Copyright (C) 2013 - 2015, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/hooks.py b/web/pgadmin/browser/hooks.py index b6b90cff8..c6642b461 100644 --- a/web/pgadmin/browser/hooks.py +++ b/web/pgadmin/browser/hooks.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2014, The pgAdmin Development Team +# Copyright (C) 2013 - 2015, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/nodes/server_groups/hooks.py b/web/pgadmin/browser/nodes/server_groups/hooks.py index 183623d0e..3316f63d9 100644 --- a/web/pgadmin/browser/nodes/server_groups/hooks.py +++ b/web/pgadmin/browser/nodes/server_groups/hooks.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2014, The pgAdmin Development Team +# Copyright (C) 2013 - 2015, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/browser/views.py b/web/pgadmin/browser/views.py index d3ac3cfad..2f3bd49d4 100644 --- a/web/pgadmin/browser/views.py +++ b/web/pgadmin/browser/views.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2014, The pgAdmin Development Team +# Copyright (C) 2013 - 2015, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/redirects/views.py b/web/pgadmin/redirects/views.py index e481237d8..ee323c9ae 100644 --- a/web/pgadmin/redirects/views.py +++ b/web/pgadmin/redirects/views.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2014, The pgAdmin Development Team +# Copyright (C) 2013 - 2015, 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 0daa60f17..fb9f1a69a 100644 --- a/web/pgadmin/settings/__init__.py +++ b/web/pgadmin/settings/__init__.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2014, The pgAdmin Development Team +# Copyright (C) 2013 - 2015, 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 f64a4f819..7bdba3dda 100644 --- a/web/pgadmin/settings/hooks.py +++ b/web/pgadmin/settings/hooks.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2014, The pgAdmin Development Team +# Copyright (C) 2013 - 2015, 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 340977e8a..9d08345cb 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 - 2014, The pgAdmin Development Team +# Copyright (C) 2013 - 2015, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/pgadmin/test/static/js/test.js b/web/pgadmin/test/static/js/test.js index 2910de3cb..031d743ce 100644 --- a/web/pgadmin/test/static/js/test.js +++ b/web/pgadmin/test/static/js/test.js @@ -1,12 +1,3 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// pgAdmin 4 - PostgreSQL Tools -// -// Copyright (C) 2013 - 2014, The pgAdmin Development Team -// This software is released under the PostgreSQL Licence -// -//////////////////////////////////////////////////////////////////////////////// - function test_alert() { alertify.alert( 'Alert Test', diff --git a/web/pgadmin/utils/views.py b/web/pgadmin/utils/views.py index 01a52f443..b0937313f 100644 --- a/web/pgadmin/utils/views.py +++ b/web/pgadmin/utils/views.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2014, The pgAdmin Development Team +# Copyright (C) 2013 - 2015, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ########################################################################## diff --git a/web/setup.py b/web/setup.py index 6351e1cb1..7cf01b2bd 100644 --- a/web/setup.py +++ b/web/setup.py @@ -2,7 +2,7 @@ # # pgAdmin 4 - PostgreSQL Tools # -# Copyright (C) 2013 - 2014, The pgAdmin Development Team +# Copyright (C) 2013 - 2015, The pgAdmin Development Team # This software is released under the PostgreSQL Licence # ##########################################################################