From 5da7062881d2946f0a8f3c7d300283f8e45cad8c Mon Sep 17 00:00:00 2001 From: Mohammad Banikazemi Date: Mon, 31 Mar 2014 13:01:47 -0400 Subject: [PATCH] Removing vim header lines Simply removes the vim header line and the empty line following it (when present) for files in the api, db, and extenssions base directories. In one single _init_ file in this patchset, all comment lines are removed. Change-Id: I81b7168dc2ad74b8c30a87e50a531e157851499e Partial-Bug: 1229324 --- neutron/api/api_common.py | 2 -- neutron/api/extensions.py | 2 -- neutron/api/versions.py | 2 -- neutron/db/agents_db.py | 2 -- neutron/db/agentschedulers_db.py | 2 -- neutron/db/db_base_plugin_v2.py | 2 -- neutron/db/external_net_db.py | 2 -- neutron/db/extraroute_db.py | 2 -- neutron/db/l3_agentschedulers_db.py | 2 -- neutron/db/models_v2.py | 2 -- neutron/db/portbindings_base.py | 2 -- neutron/db/portbindings_db.py | 2 -- neutron/db/quota_db.py | 2 -- neutron/db/routedserviceinsertion_db.py | 2 -- neutron/db/routerservicetype_db.py | 2 -- neutron/db/securitygroups_rpc_base.py | 2 -- neutron/db/servicetype_db.py | 1 - neutron/db/sqlalchemyutils.py | 2 -- neutron/extensions/__init__.py | 15 --------------- neutron/extensions/dhcpagentscheduler.py | 2 -- neutron/extensions/external_net.py | 2 -- neutron/extensions/extraroute.py | 2 -- neutron/extensions/firewall.py | 2 -- neutron/extensions/flavor.py | 2 -- neutron/extensions/l3agentscheduler.py | 2 -- neutron/extensions/lbaas_agentscheduler.py | 2 -- neutron/extensions/loadbalancer.py | 2 -- neutron/extensions/multiprovidernet.py | 2 -- neutron/extensions/portbindings.py | 2 -- neutron/extensions/providernet.py | 2 -- neutron/extensions/quotasv2.py | 2 -- neutron/extensions/routedserviceinsertion.py | 2 -- neutron/extensions/routerservicetype.py | 2 -- neutron/extensions/securitygroup.py | 2 -- neutron/extensions/servicetype.py | 2 -- neutron/extensions/vpnaas.py | 2 -- 36 files changed, 84 deletions(-) diff --git a/neutron/api/api_common.py b/neutron/api/api_common.py index 5f6e5151ea..e370e2e5a9 100644 --- a/neutron/api/api_common.py +++ b/neutron/api/api_common.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Citrix System. # All Rights Reserved. # diff --git a/neutron/api/extensions.py b/neutron/api/extensions.py index 6f6210947a..4369c2135c 100644 --- a/neutron/api/extensions.py +++ b/neutron/api/extensions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation. # Copyright 2011 Justin Santa Barbara # All Rights Reserved. diff --git a/neutron/api/versions.py b/neutron/api/versions.py index 671a56ec30..cdfa1e081b 100644 --- a/neutron/api/versions.py +++ b/neutron/api/versions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Citrix Systems. # All Rights Reserved. # diff --git a/neutron/db/agents_db.py b/neutron/db/agents_db.py index 08358e85f0..bd5e745ad3 100644 --- a/neutron/db/agents_db.py +++ b/neutron/db/agents_db.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/db/agentschedulers_db.py b/neutron/db/agentschedulers_db.py index 4965d13387..1e46a94faa 100644 --- a/neutron/db/agentschedulers_db.py +++ b/neutron/db/agentschedulers_db.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/db/db_base_plugin_v2.py b/neutron/db/db_base_plugin_v2.py index 0701ff8cc5..1be937cbae 100644 --- a/neutron/db/db_base_plugin_v2.py +++ b/neutron/db/db_base_plugin_v2.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/db/external_net_db.py b/neutron/db/external_net_db.py index 96602eca63..32fccb8474 100644 --- a/neutron/db/external_net_db.py +++ b/neutron/db/external_net_db.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/db/extraroute_db.py b/neutron/db/extraroute_db.py index a316ad6f2b..dc8fb773b9 100644 --- a/neutron/db/extraroute_db.py +++ b/neutron/db/extraroute_db.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013, Nachi Ueno, NTT MCL, Inc. # All Rights Reserved. # diff --git a/neutron/db/l3_agentschedulers_db.py b/neutron/db/l3_agentschedulers_db.py index 04602b1382..fa9d03b098 100644 --- a/neutron/db/l3_agentschedulers_db.py +++ b/neutron/db/l3_agentschedulers_db.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/db/models_v2.py b/neutron/db/models_v2.py index 718195f349..bbf9d64557 100644 --- a/neutron/db/models_v2.py +++ b/neutron/db/models_v2.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/db/portbindings_base.py b/neutron/db/portbindings_base.py index 615b017b75..045b7e3f26 100644 --- a/neutron/db/portbindings_base.py +++ b/neutron/db/portbindings_base.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 UnitedStack Inc. # All Rights Reserved. # diff --git a/neutron/db/portbindings_db.py b/neutron/db/portbindings_db.py index 9eacaedf86..1f94f83974 100644 --- a/neutron/db/portbindings_db.py +++ b/neutron/db/portbindings_db.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # All Rights Reserved. # diff --git a/neutron/db/quota_db.py b/neutron/db/quota_db.py index c74dac2be7..dc6a3cf4bb 100644 --- a/neutron/db/quota_db.py +++ b/neutron/db/quota_db.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/db/routedserviceinsertion_db.py b/neutron/db/routedserviceinsertion_db.py index 12f32e1e76..25b87ca420 100644 --- a/neutron/db/routedserviceinsertion_db.py +++ b/neutron/db/routedserviceinsertion_db.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 VMware, Inc. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/neutron/db/routerservicetype_db.py b/neutron/db/routerservicetype_db.py index 1fc5ec5523..9037a0bb4a 100644 --- a/neutron/db/routerservicetype_db.py +++ b/neutron/db/routerservicetype_db.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 VMware, Inc. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/neutron/db/securitygroups_rpc_base.py b/neutron/db/securitygroups_rpc_base.py index f0867e6cdc..be3892b99b 100644 --- a/neutron/db/securitygroups_rpc_base.py +++ b/neutron/db/securitygroups_rpc_base.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2012, Nachi Ueno, NTT MCL, Inc. # All Rights Reserved. # diff --git a/neutron/db/servicetype_db.py b/neutron/db/servicetype_db.py index d550c260ca..3e9ad15e09 100644 --- a/neutron/db/servicetype_db.py +++ b/neutron/db/servicetype_db.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2013 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/db/sqlalchemyutils.py b/neutron/db/sqlalchemyutils.py index 23dd6447f9..e1d525391a 100644 --- a/neutron/db/sqlalchemyutils.py +++ b/neutron/db/sqlalchemyutils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/extensions/__init__.py b/neutron/extensions/__init__.py index 4ac574e586..e69de29bb2 100644 --- a/neutron/extensions/__init__.py +++ b/neutron/extensions/__init__.py @@ -1,15 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2011 OpenStack Foundation -# -# 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/neutron/extensions/dhcpagentscheduler.py b/neutron/extensions/dhcpagentscheduler.py index 994ad8eb1c..90e26b06db 100644 --- a/neutron/extensions/dhcpagentscheduler.py +++ b/neutron/extensions/dhcpagentscheduler.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 OpenStack Foundation. # All rights reserved. # diff --git a/neutron/extensions/external_net.py b/neutron/extensions/external_net.py index 613b02804f..6e50e93cb0 100644 --- a/neutron/extensions/external_net.py +++ b/neutron/extensions/external_net.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/extensions/extraroute.py b/neutron/extensions/extraroute.py index 5f2c7a8c70..7c63baa22a 100644 --- a/neutron/extensions/extraroute.py +++ b/neutron/extensions/extraroute.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013, Nachi Ueno, NTT MCL, Inc. # All Rights Reserved. # diff --git a/neutron/extensions/firewall.py b/neutron/extensions/firewall.py index b3279bb431..922bec3605 100644 --- a/neutron/extensions/firewall.py +++ b/neutron/extensions/firewall.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Big Switch Networks, Inc. # All Rights Reserved. # diff --git a/neutron/extensions/flavor.py b/neutron/extensions/flavor.py index 4f7be18d13..c5937d932b 100644 --- a/neutron/extensions/flavor.py +++ b/neutron/extensions/flavor.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Nachi Ueno, NTT MCL, Inc. # All rights reserved. # diff --git a/neutron/extensions/l3agentscheduler.py b/neutron/extensions/l3agentscheduler.py index e5d1b4ef42..da6bcb64e9 100644 --- a/neutron/extensions/l3agentscheduler.py +++ b/neutron/extensions/l3agentscheduler.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 OpenStack Foundation. # All rights reserved. # diff --git a/neutron/extensions/lbaas_agentscheduler.py b/neutron/extensions/lbaas_agentscheduler.py index 3463db9362..2a776fc90d 100644 --- a/neutron/extensions/lbaas_agentscheduler.py +++ b/neutron/extensions/lbaas_agentscheduler.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 OpenStack Foundation. # All rights reserved. # diff --git a/neutron/extensions/loadbalancer.py b/neutron/extensions/loadbalancer.py index c534b77f72..80a1d45a9b 100644 --- a/neutron/extensions/loadbalancer.py +++ b/neutron/extensions/loadbalancer.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/extensions/multiprovidernet.py b/neutron/extensions/multiprovidernet.py index 3ed3f69256..8dbcf71241 100644 --- a/neutron/extensions/multiprovidernet.py +++ b/neutron/extensions/multiprovidernet.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 OpenStack Foundation. # All rights reserved. # diff --git a/neutron/extensions/portbindings.py b/neutron/extensions/portbindings.py index 002c9f2a17..7e5c76dd3f 100644 --- a/neutron/extensions/portbindings.py +++ b/neutron/extensions/portbindings.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation. # All rights reserved. # diff --git a/neutron/extensions/providernet.py b/neutron/extensions/providernet.py index 1284ace3b2..944de104fb 100644 --- a/neutron/extensions/providernet.py +++ b/neutron/extensions/providernet.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation. # All rights reserved. # diff --git a/neutron/extensions/quotasv2.py b/neutron/extensions/quotasv2.py index 87e75ed446..5700092809 100644 --- a/neutron/extensions/quotasv2.py +++ b/neutron/extensions/quotasv2.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/extensions/routedserviceinsertion.py b/neutron/extensions/routedserviceinsertion.py index fc84c01667..06ff9e259c 100644 --- a/neutron/extensions/routedserviceinsertion.py +++ b/neutron/extensions/routedserviceinsertion.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 VMware, Inc. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/neutron/extensions/routerservicetype.py b/neutron/extensions/routerservicetype.py index 17f032362b..6168adf36f 100644 --- a/neutron/extensions/routerservicetype.py +++ b/neutron/extensions/routerservicetype.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 VMware, Inc. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/neutron/extensions/securitygroup.py b/neutron/extensions/securitygroup.py index ad2960facd..f6f1819257 100644 --- a/neutron/extensions/securitygroup.py +++ b/neutron/extensions/securitygroup.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation. # All rights reserved. # diff --git a/neutron/extensions/servicetype.py b/neutron/extensions/servicetype.py index dd9e4c8262..25633775d9 100644 --- a/neutron/extensions/servicetype.py +++ b/neutron/extensions/servicetype.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/extensions/vpnaas.py b/neutron/extensions/vpnaas.py index 4ffe65fd9e..7c44725cea 100644 --- a/neutron/extensions/vpnaas.py +++ b/neutron/extensions/vpnaas.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # (c) Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. #