From ec057bb073e51b21efef2246ee3428bc80e08a18 Mon Sep 17 00:00:00 2001 From: He Yongli Date: Thu, 13 Feb 2014 13:07:24 +0800 Subject: [PATCH] Remove extraneous vim configuration comments Remove vim setting Remove line containing comment - # vim: tabstop=4 shiftwidth=4 softtabstop=4 at the top of source code files, except for files in openstack/common. Change-Id: I7d43f92e0110b597452183ae22acaf1114efd3f9 Close-bug: #1229324 --- tools/install_venv_common.py | 2 -- tuskar/__init__.py | 2 -- tuskar/api/__init__.py | 2 -- tuskar/api/app.py | 1 - tuskar/api/renderers.py | 1 - tuskar/cmd/api.py | 2 -- tuskar/cmd/dbsync.py | 2 -- tuskar/cmd/manager.py | 2 -- tuskar/common/__init__.py | 16 ---------------- tuskar/common/config.py | 2 -- tuskar/common/context.py | 2 -- tuskar/common/paths.py | 2 -- tuskar/common/policy.py | 2 -- tuskar/common/safe_utils.py | 2 -- tuskar/common/utils.py | 2 -- tuskar/compute/nova.py | 2 -- tuskar/db/api.py | 1 - tuskar/db/migration.py | 2 -- tuskar/db/sqlalchemy/api.py | 1 - tuskar/db/sqlalchemy/migrate_repo/manage.py | 1 - tuskar/db/sqlalchemy/migration.py | 2 -- tuskar/heat/client.py | 2 -- tuskar/manager/__init__.py | 1 - tuskar/manager/manager.py | 1 - tuskar/netconf.py | 2 -- tuskar/tests/__init__.py | 2 -- tuskar/tests/api/controllers/__init__.py | 2 -- tuskar/tests/base.py | 2 -- tuskar/tests/conf_fixture.py | 2 -- tuskar/tests/fake_policy.py | 2 -- tuskar/tests/test_dbsync.py | 3 --- tuskar/tests/test_utils.py | 2 -- tuskar/version.py | 2 -- 33 files changed, 74 deletions(-) diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index 4267387b..faa9796a 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # Copyright 2013 IBM Corp. # diff --git a/tuskar/__init__.py b/tuskar/__init__.py index 56425d0f..ec87a0fd 100644 --- a/tuskar/__init__.py +++ b/tuskar/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/tuskar/api/__init__.py b/tuskar/api/__init__.py index 25695031..02ff5fba 100644 --- a/tuskar/api/__init__.py +++ b/tuskar/api/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/tuskar/api/app.py b/tuskar/api/app.py index e0b589ff..04969db2 100644 --- a/tuskar/api/app.py +++ b/tuskar/api/app.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # Copyright © 2012 New Dream Network, LLC (DreamHost) diff --git a/tuskar/api/renderers.py b/tuskar/api/renderers.py index cd94ee32..641f7d1c 100644 --- a/tuskar/api/renderers.py +++ b/tuskar/api/renderers.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # Copyright 2013 Red Hat, Inc. # diff --git a/tuskar/cmd/api.py b/tuskar/cmd/api.py index 5d6033a7..b6a9c7ca 100644 --- a/tuskar/cmd/api.py +++ b/tuskar/cmd/api.py @@ -1,8 +1,6 @@ #!/usr/bin/env python # -*- encoding: utf-8 -*- # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/tuskar/cmd/dbsync.py b/tuskar/cmd/dbsync.py index b51d844f..78a06769 100644 --- a/tuskar/cmd/dbsync.py +++ b/tuskar/cmd/dbsync.py @@ -1,8 +1,6 @@ #!/usr/bin/env python # -*- encoding: utf-8 -*- # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/tuskar/cmd/manager.py b/tuskar/cmd/manager.py index 8c52da89..62ba8d05 100644 --- a/tuskar/cmd/manager.py +++ b/tuskar/cmd/manager.py @@ -1,8 +1,6 @@ #!/usr/bin/env python # -*- encoding: utf-8 -*- # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/tuskar/common/__init__.py b/tuskar/common/__init__.py index 56425d0f..e69de29b 100644 --- a/tuskar/common/__init__.py +++ b/tuskar/common/__init__.py @@ -1,16 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. diff --git a/tuskar/common/config.py b/tuskar/common/config.py index eab22ca8..6877a4b9 100644 --- a/tuskar/common/config.py +++ b/tuskar/common/config.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/tuskar/common/context.py b/tuskar/common/context.py index 6722e1dc..c4b55a0c 100644 --- a/tuskar/common/context.py +++ b/tuskar/common/context.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/tuskar/common/paths.py b/tuskar/common/paths.py index 8d84289a..58dfe8d3 100644 --- a/tuskar/common/paths.py +++ b/tuskar/common/paths.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/tuskar/common/policy.py b/tuskar/common/policy.py index 5b2bf82a..d8af3dc8 100644 --- a/tuskar/common/policy.py +++ b/tuskar/common/policy.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/tuskar/common/safe_utils.py b/tuskar/common/safe_utils.py index 9c8fc281..a6d27347 100644 --- a/tuskar/common/safe_utils.py +++ b/tuskar/common/safe_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2011 Justin Santa Barbara diff --git a/tuskar/common/utils.py b/tuskar/common/utils.py index 86d141f2..63297a7d 100644 --- a/tuskar/common/utils.py +++ b/tuskar/common/utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2011 Justin Santa Barbara diff --git a/tuskar/compute/nova.py b/tuskar/compute/nova.py index 2fcddf8c..7e380b51 100644 --- a/tuskar/compute/nova.py +++ b/tuskar/compute/nova.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Red Hat # All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/tuskar/db/api.py b/tuskar/db/api.py index 5385b3e4..8a3bfc56 100644 --- a/tuskar/db/api.py +++ b/tuskar/db/api.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/tuskar/db/migration.py b/tuskar/db/migration.py index fe00e837..68502642 100644 --- a/tuskar/db/migration.py +++ b/tuskar/db/migration.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/tuskar/db/sqlalchemy/api.py b/tuskar/db/sqlalchemy/api.py index 2f59ea6c..e609e91e 100644 --- a/tuskar/db/sqlalchemy/api.py +++ b/tuskar/db/sqlalchemy/api.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/tuskar/db/sqlalchemy/migrate_repo/manage.py b/tuskar/db/sqlalchemy/migrate_repo/manage.py index a5502298..c4703956 100644 --- a/tuskar/db/sqlalchemy/migrate_repo/manage.py +++ b/tuskar/db/sqlalchemy/migrate_repo/manage.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/tuskar/db/sqlalchemy/migration.py b/tuskar/db/sqlalchemy/migration.py index f2930384..6accc103 100644 --- a/tuskar/db/sqlalchemy/migration.py +++ b/tuskar/db/sqlalchemy/migration.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/tuskar/heat/client.py b/tuskar/heat/client.py index 8129c690..908e6e96 100644 --- a/tuskar/heat/client.py +++ b/tuskar/heat/client.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Red Hat # All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/tuskar/manager/__init__.py b/tuskar/manager/__init__.py index 1380d809..aad7a805 100644 --- a/tuskar/manager/__init__.py +++ b/tuskar/manager/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/tuskar/manager/manager.py b/tuskar/manager/manager.py index 96aab401..71c83caf 100644 --- a/tuskar/manager/manager.py +++ b/tuskar/manager/manager.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/tuskar/netconf.py b/tuskar/netconf.py index 1f480926..bccda06c 100644 --- a/tuskar/netconf.py +++ b/tuskar/netconf.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/tuskar/tests/__init__.py b/tuskar/tests/__init__.py index eb8b5ef6..8960b419 100644 --- a/tuskar/tests/__init__.py +++ b/tuskar/tests/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/tuskar/tests/api/controllers/__init__.py b/tuskar/tests/api/controllers/__init__.py index 56425d0f..ec87a0fd 100644 --- a/tuskar/tests/api/controllers/__init__.py +++ b/tuskar/tests/api/controllers/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/tuskar/tests/base.py b/tuskar/tests/base.py index ebd58d28..bae52402 100644 --- a/tuskar/tests/base.py +++ b/tuskar/tests/base.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/tuskar/tests/conf_fixture.py b/tuskar/tests/conf_fixture.py index ea1b8f0d..9eef83df 100644 --- a/tuskar/tests/conf_fixture.py +++ b/tuskar/tests/conf_fixture.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/tuskar/tests/fake_policy.py b/tuskar/tests/fake_policy.py index ecd72eaf..bb829067 100644 --- a/tuskar/tests/fake_policy.py +++ b/tuskar/tests/fake_policy.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/tuskar/tests/test_dbsync.py b/tuskar/tests/test_dbsync.py index 77aa15ae..3ceb75aa 100644 --- a/tuskar/tests/test_dbsync.py +++ b/tuskar/tests/test_dbsync.py @@ -1,8 +1,5 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/tuskar/tests/test_utils.py b/tuskar/tests/test_utils.py index e4f9811a..aadb6b47 100644 --- a/tuskar/tests/test_utils.py +++ b/tuskar/tests/test_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Justin Santa Barbara # Copyright 2012 Hewlett-Packard Development Company, L.P. # diff --git a/tuskar/version.py b/tuskar/version.py index 3ae97f8b..f5d139ec 100644 --- a/tuskar/version.py +++ b/tuskar/version.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. #