From e955a1fc80befc84ab501e967fe6ef09beb5c4dc Mon Sep 17 00:00:00 2001
From: liu-sheng <liusheng@huawei.com>
Date: Mon, 10 Feb 2014 17:00:28 +0800
Subject: [PATCH] Remove vi modelines

We don't need to have the vi modelines in each source file,
it can be set in a user's vimrc if required.

Change-Id: Ic30e91df1b0e25beda9b8d8c19be58573cdae4f6
Closes-Bug: #1229324
---
 neutronclient/__init__.py                                      | 2 --
 neutronclient/client.py                                        | 1 -
 neutronclient/common/clientmanager.py                          | 1 -
 neutronclient/common/command.py                                | 1 -
 neutronclient/common/exceptions.py                             | 2 --
 neutronclient/common/serializer.py                             | 2 --
 neutronclient/common/utils.py                                  | 2 --
 neutronclient/neutron/client.py                                | 1 -
 neutronclient/neutron/v2_0/__init__.py                         | 1 -
 neutronclient/neutron/v2_0/agent.py                            | 1 -
 neutronclient/neutron/v2_0/agentscheduler.py                   | 1 -
 neutronclient/neutron/v2_0/credential.py                       | 3 ---
 neutronclient/neutron/v2_0/extension.py                        | 1 -
 neutronclient/neutron/v2_0/floatingip.py                       | 1 -
 neutronclient/neutron/v2_0/fw/firewall.py                      | 1 -
 neutronclient/neutron/v2_0/fw/firewallpolicy.py                | 1 -
 neutronclient/neutron/v2_0/fw/firewallrule.py                  | 1 -
 neutronclient/neutron/v2_0/lb/healthmonitor.py                 | 1 -
 neutronclient/neutron/v2_0/lb/member.py                        | 1 -
 neutronclient/neutron/v2_0/lb/pool.py                          | 1 -
 neutronclient/neutron/v2_0/lb/vip.py                           | 1 -
 neutronclient/neutron/v2_0/network.py                          | 1 -
 neutronclient/neutron/v2_0/networkprofile.py                   | 2 --
 neutronclient/neutron/v2_0/nsx/networkgateway.py               | 1 -
 neutronclient/neutron/v2_0/nsx/qos_queue.py                    | 2 --
 neutronclient/neutron/v2_0/policyprofile.py                    | 2 --
 neutronclient/neutron/v2_0/port.py                             | 1 -
 neutronclient/neutron/v2_0/quota.py                            | 1 -
 neutronclient/neutron/v2_0/router.py                           | 1 -
 neutronclient/neutron/v2_0/securitygroup.py                    | 1 -
 neutronclient/neutron/v2_0/servicetype.py                      | 1 -
 neutronclient/neutron/v2_0/subnet.py                           | 1 -
 neutronclient/neutron/v2_0/vpn/ikepolicy.py                    | 2 --
 neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py        | 2 --
 neutronclient/neutron/v2_0/vpn/ipsecpolicy.py                  | 2 --
 neutronclient/neutron/v2_0/vpn/utils.py                        | 2 --
 neutronclient/neutron/v2_0/vpn/vpnservice.py                   | 2 --
 neutronclient/openstack/common/gettextutils.py                 | 2 --
 neutronclient/openstack/common/importutils.py                  | 2 --
 neutronclient/openstack/common/jsonutils.py                    | 2 --
 neutronclient/openstack/common/strutils.py                     | 2 --
 neutronclient/openstack/common/timeutils.py                    | 2 --
 neutronclient/shell.py                                         | 1 -
 neutronclient/tests/unit/fw/test_cli20_firewall.py             | 1 -
 neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py       | 1 -
 neutronclient/tests/unit/fw/test_cli20_firewallrule.py         | 1 -
 neutronclient/tests/unit/lb/test_cli20_healthmonitor.py        | 1 -
 neutronclient/tests/unit/lb/test_cli20_member.py               | 1 -
 neutronclient/tests/unit/lb/test_cli20_pool.py                 | 1 -
 neutronclient/tests/unit/lb/test_cli20_vip.py                  | 1 -
 neutronclient/tests/unit/test_auth.py                          | 1 -
 neutronclient/tests/unit/test_casual_args.py                   | 1 -
 neutronclient/tests/unit/test_cli20.py                         | 1 -
 neutronclient/tests/unit/test_cli20_agenschedulers.py          | 1 -
 neutronclient/tests/unit/test_cli20_credential.py              | 1 -
 neutronclient/tests/unit/test_cli20_extensions.py              | 2 --
 neutronclient/tests/unit/test_cli20_floatingips.py             | 2 --
 neutronclient/tests/unit/test_cli20_network.py                 | 1 -
 neutronclient/tests/unit/test_cli20_networkprofile.py          | 1 -
 neutronclient/tests/unit/test_cli20_nsx_networkgateway.py      | 1 -
 neutronclient/tests/unit/test_cli20_nsx_queue.py               | 2 --
 neutronclient/tests/unit/test_cli20_policyprofile.py           | 1 -
 neutronclient/tests/unit/test_cli20_port.py                    | 1 -
 neutronclient/tests/unit/test_cli20_router.py                  | 1 -
 neutronclient/tests/unit/test_cli20_securitygroup.py           | 2 --
 neutronclient/tests/unit/test_cli20_servicetype.py             | 1 -
 neutronclient/tests/unit/test_cli20_subnet.py                  | 1 -
 neutronclient/tests/unit/test_http.py                          | 1 -
 neutronclient/tests/unit/test_name_or_id.py                    | 1 -
 neutronclient/tests/unit/test_quota.py                         | 1 -
 neutronclient/tests/unit/test_shell.py                         | 1 -
 neutronclient/tests/unit/test_ssl.py                           | 1 -
 neutronclient/tests/unit/test_utils.py                         | 1 -
 neutronclient/tests/unit/vpn/__init__.py                       | 2 --
 neutronclient/tests/unit/vpn/test_cli20_ikepolicy.py           | 2 --
 .../tests/unit/vpn/test_cli20_ipsec_site_connection.py         | 2 --
 neutronclient/tests/unit/vpn/test_cli20_ipsecpolicy.py         | 2 --
 neutronclient/tests/unit/vpn/test_cli20_vpnservice.py          | 2 --
 neutronclient/tests/unit/vpn/test_utils.py                     | 2 --
 neutronclient/v2_0/client.py                                   | 1 -
 80 files changed, 109 deletions(-)

diff --git a/neutronclient/__init__.py b/neutronclient/__init__.py
index 034d66eaf..247aef8c1 100644
--- a/neutronclient/__init__.py
+++ b/neutronclient/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 Citrix Systems
 # All Rights Reserved.
 #
diff --git a/neutronclient/client.py b/neutronclient/client.py
index 061812e28..53cc883d7 100644
--- a/neutronclient/client.py
+++ b/neutronclient/client.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 try:
     import json
diff --git a/neutronclient/common/clientmanager.py b/neutronclient/common/clientmanager.py
index 57af057da..62cc12932 100644
--- a/neutronclient/common/clientmanager.py
+++ b/neutronclient/common/clientmanager.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 """Manage access to the clients, including authenticating when needed.
 """
diff --git a/neutronclient/common/command.py b/neutronclient/common/command.py
index 81a63e500..2cd32935a 100644
--- a/neutronclient/common/command.py
+++ b/neutronclient/common/command.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 """
 OpenStack base command
diff --git a/neutronclient/common/exceptions.py b/neutronclient/common/exceptions.py
index 93473105a..6e2541ad9 100644
--- a/neutronclient/common/exceptions.py
+++ b/neutronclient/common/exceptions.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 VMware, Inc
 # All Rights Reserved.
 #
diff --git a/neutronclient/common/serializer.py b/neutronclient/common/serializer.py
index dc2769879..b8d6d81ed 100644
--- a/neutronclient/common/serializer.py
+++ b/neutronclient/common/serializer.py
@@ -13,8 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 ###
 ### Codes from neutron wsgi
 ###
diff --git a/neutronclient/common/utils.py b/neutronclient/common/utils.py
index 2fb23a5c2..532d7ea7d 100644
--- a/neutronclient/common/utils.py
+++ b/neutronclient/common/utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011, VMware, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/neutronclient/neutron/client.py b/neutronclient/neutron/client.py
index 723ad2c1f..f87c8311b 100644
--- a/neutronclient/neutron/client.py
+++ b/neutronclient/neutron/client.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 from neutronclient.common import exceptions
 from neutronclient.common import utils
diff --git a/neutronclient/neutron/v2_0/__init__.py b/neutronclient/neutron/v2_0/__init__.py
index c9dbdf738..d4a2a104d 100644
--- a/neutronclient/neutron/v2_0/__init__.py
+++ b/neutronclient/neutron/v2_0/__init__.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import argparse
 import logging
diff --git a/neutronclient/neutron/v2_0/agent.py b/neutronclient/neutron/v2_0/agent.py
index e2d16d406..fd0bf4864 100644
--- a/neutronclient/neutron/v2_0/agent.py
+++ b/neutronclient/neutron/v2_0/agent.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import logging
 
diff --git a/neutronclient/neutron/v2_0/agentscheduler.py b/neutronclient/neutron/v2_0/agentscheduler.py
index 8550d59b0..32a66f425 100644
--- a/neutronclient/neutron/v2_0/agentscheduler.py
+++ b/neutronclient/neutron/v2_0/agentscheduler.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import logging
 
diff --git a/neutronclient/neutron/v2_0/credential.py b/neutronclient/neutron/v2_0/credential.py
index 08b4a9a1c..066215eb4 100644
--- a/neutronclient/neutron/v2_0/credential.py
+++ b/neutronclient/neutron/v2_0/credential.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    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
@@ -12,7 +10,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import logging
 
diff --git a/neutronclient/neutron/v2_0/extension.py b/neutronclient/neutron/v2_0/extension.py
index 87cb5174b..599165955 100644
--- a/neutronclient/neutron/v2_0/extension.py
+++ b/neutronclient/neutron/v2_0/extension.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import logging
 
diff --git a/neutronclient/neutron/v2_0/floatingip.py b/neutronclient/neutron/v2_0/floatingip.py
index 4d5fdde05..666f08424 100644
--- a/neutronclient/neutron/v2_0/floatingip.py
+++ b/neutronclient/neutron/v2_0/floatingip.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import argparse
 import logging
diff --git a/neutronclient/neutron/v2_0/fw/firewall.py b/neutronclient/neutron/v2_0/fw/firewall.py
index 8f43df07a..1d693b6f9 100644
--- a/neutronclient/neutron/v2_0/fw/firewall.py
+++ b/neutronclient/neutron/v2_0/fw/firewall.py
@@ -15,7 +15,6 @@
 #
 # @author: KC Wang, Big Switch Networks
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import argparse
 import logging
diff --git a/neutronclient/neutron/v2_0/fw/firewallpolicy.py b/neutronclient/neutron/v2_0/fw/firewallpolicy.py
index db54e4af0..b67d2b947 100644
--- a/neutronclient/neutron/v2_0/fw/firewallpolicy.py
+++ b/neutronclient/neutron/v2_0/fw/firewallpolicy.py
@@ -15,7 +15,6 @@
 #
 # @author: KC Wang, Big Switch Networks
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import argparse
 import logging
diff --git a/neutronclient/neutron/v2_0/fw/firewallrule.py b/neutronclient/neutron/v2_0/fw/firewallrule.py
index 2dbce7db9..072a074c0 100644
--- a/neutronclient/neutron/v2_0/fw/firewallrule.py
+++ b/neutronclient/neutron/v2_0/fw/firewallrule.py
@@ -15,7 +15,6 @@
 #
 # @author: KC Wang, Big Switch Networks
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import argparse
 import logging
diff --git a/neutronclient/neutron/v2_0/lb/healthmonitor.py b/neutronclient/neutron/v2_0/lb/healthmonitor.py
index 70a608702..26cc9b722 100644
--- a/neutronclient/neutron/v2_0/lb/healthmonitor.py
+++ b/neutronclient/neutron/v2_0/lb/healthmonitor.py
@@ -15,7 +15,6 @@
 #
 # @author: Ilya Shakhat, Mirantis Inc.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import logging
 
diff --git a/neutronclient/neutron/v2_0/lb/member.py b/neutronclient/neutron/v2_0/lb/member.py
index 5251021e1..c6ba275d6 100644
--- a/neutronclient/neutron/v2_0/lb/member.py
+++ b/neutronclient/neutron/v2_0/lb/member.py
@@ -15,7 +15,6 @@
 #
 # @author: Ilya Shakhat, Mirantis Inc.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import logging
 
diff --git a/neutronclient/neutron/v2_0/lb/pool.py b/neutronclient/neutron/v2_0/lb/pool.py
index 6b62f3a9a..aa4d9f727 100644
--- a/neutronclient/neutron/v2_0/lb/pool.py
+++ b/neutronclient/neutron/v2_0/lb/pool.py
@@ -15,7 +15,6 @@
 #
 # @author: Ilya Shakhat, Mirantis Inc.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import logging
 
diff --git a/neutronclient/neutron/v2_0/lb/vip.py b/neutronclient/neutron/v2_0/lb/vip.py
index 686e6ae13..cf5a57c8c 100644
--- a/neutronclient/neutron/v2_0/lb/vip.py
+++ b/neutronclient/neutron/v2_0/lb/vip.py
@@ -15,7 +15,6 @@
 #
 # @author: Ilya Shakhat, Mirantis Inc.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import logging
 
diff --git a/neutronclient/neutron/v2_0/network.py b/neutronclient/neutron/v2_0/network.py
index 5f468f98a..c7c4c168d 100644
--- a/neutronclient/neutron/v2_0/network.py
+++ b/neutronclient/neutron/v2_0/network.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import argparse
 import logging
diff --git a/neutronclient/neutron/v2_0/networkprofile.py b/neutronclient/neutron/v2_0/networkprofile.py
index 4c67f0e4f..fd11d040b 100644
--- a/neutronclient/neutron/v2_0/networkprofile.py
+++ b/neutronclient/neutron/v2_0/networkprofile.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    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
diff --git a/neutronclient/neutron/v2_0/nsx/networkgateway.py b/neutronclient/neutron/v2_0/nsx/networkgateway.py
index 97373966f..9e474706f 100644
--- a/neutronclient/neutron/v2_0/nsx/networkgateway.py
+++ b/neutronclient/neutron/v2_0/nsx/networkgateway.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import logging
 
diff --git a/neutronclient/neutron/v2_0/nsx/qos_queue.py b/neutronclient/neutron/v2_0/nsx/qos_queue.py
index 9b4a79bc1..e3eff3006 100644
--- a/neutronclient/neutron/v2_0/nsx/qos_queue.py
+++ b/neutronclient/neutron/v2_0/nsx/qos_queue.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 VMware Inc.
 # All Rights Reserved
 #
diff --git a/neutronclient/neutron/v2_0/policyprofile.py b/neutronclient/neutron/v2_0/policyprofile.py
index c10a29cef..a90593e2e 100644
--- a/neutronclient/neutron/v2_0/policyprofile.py
+++ b/neutronclient/neutron/v2_0/policyprofile.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    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
diff --git a/neutronclient/neutron/v2_0/port.py b/neutronclient/neutron/v2_0/port.py
index 2f9565a3c..f3a2cf574 100644
--- a/neutronclient/neutron/v2_0/port.py
+++ b/neutronclient/neutron/v2_0/port.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import argparse
 import logging
diff --git a/neutronclient/neutron/v2_0/quota.py b/neutronclient/neutron/v2_0/quota.py
index c449c2fda..8c1fd15b4 100644
--- a/neutronclient/neutron/v2_0/quota.py
+++ b/neutronclient/neutron/v2_0/quota.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import argparse
 import logging
diff --git a/neutronclient/neutron/v2_0/router.py b/neutronclient/neutron/v2_0/router.py
index f2de6d39c..7158db81d 100644
--- a/neutronclient/neutron/v2_0/router.py
+++ b/neutronclient/neutron/v2_0/router.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import argparse
 import logging
diff --git a/neutronclient/neutron/v2_0/securitygroup.py b/neutronclient/neutron/v2_0/securitygroup.py
index e125e4991..b59eba5cc 100644
--- a/neutronclient/neutron/v2_0/securitygroup.py
+++ b/neutronclient/neutron/v2_0/securitygroup.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import argparse
 import logging
diff --git a/neutronclient/neutron/v2_0/servicetype.py b/neutronclient/neutron/v2_0/servicetype.py
index fca249863..4666a9706 100644
--- a/neutronclient/neutron/v2_0/servicetype.py
+++ b/neutronclient/neutron/v2_0/servicetype.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import logging
 
diff --git a/neutronclient/neutron/v2_0/subnet.py b/neutronclient/neutron/v2_0/subnet.py
index 24bb34d15..de0569f30 100644
--- a/neutronclient/neutron/v2_0/subnet.py
+++ b/neutronclient/neutron/v2_0/subnet.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import argparse
 import logging
diff --git a/neutronclient/neutron/v2_0/vpn/ikepolicy.py b/neutronclient/neutron/v2_0/vpn/ikepolicy.py
index 3ac647d9e..2f15e5245 100644
--- a/neutronclient/neutron/v2_0/vpn/ikepolicy.py
+++ b/neutronclient/neutron/v2_0/vpn/ikepolicy.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #    All Rights Reserved.
 #
diff --git a/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py b/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py
index c22438085..35ca19e65 100644
--- a/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py
+++ b/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #    All Rights Reserved.
 #
diff --git a/neutronclient/neutron/v2_0/vpn/ipsecpolicy.py b/neutronclient/neutron/v2_0/vpn/ipsecpolicy.py
index baffacf90..a8a43238c 100644
--- a/neutronclient/neutron/v2_0/vpn/ipsecpolicy.py
+++ b/neutronclient/neutron/v2_0/vpn/ipsecpolicy.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #    All Rights Reserved.
 #
diff --git a/neutronclient/neutron/v2_0/vpn/utils.py b/neutronclient/neutron/v2_0/vpn/utils.py
index a25ebbfaa..fa1091161 100644
--- a/neutronclient/neutron/v2_0/vpn/utils.py
+++ b/neutronclient/neutron/v2_0/vpn/utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #    All Rights Reserved.
 #
diff --git a/neutronclient/neutron/v2_0/vpn/vpnservice.py b/neutronclient/neutron/v2_0/vpn/vpnservice.py
index 8e7c507f2..87bec2fee 100644
--- a/neutronclient/neutron/v2_0/vpn/vpnservice.py
+++ b/neutronclient/neutron/v2_0/vpn/vpnservice.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #    All Rights Reserved.
 #
diff --git a/neutronclient/openstack/common/gettextutils.py b/neutronclient/openstack/common/gettextutils.py
index ff730e96a..25432d677 100644
--- a/neutronclient/openstack/common/gettextutils.py
+++ b/neutronclient/openstack/common/gettextutils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Red Hat, Inc.
 # Copyright 2013 IBM Corp.
 # All Rights Reserved.
diff --git a/neutronclient/openstack/common/importutils.py b/neutronclient/openstack/common/importutils.py
index 737c33552..7ab07b88e 100644
--- a/neutronclient/openstack/common/importutils.py
+++ b/neutronclient/openstack/common/importutils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation.
 # All Rights Reserved.
 #
diff --git a/neutronclient/openstack/common/jsonutils.py b/neutronclient/openstack/common/jsonutils.py
index 43e6541d7..2930dc33b 100644
--- a/neutronclient/openstack/common/jsonutils.py
+++ b/neutronclient/openstack/common/jsonutils.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/neutronclient/openstack/common/strutils.py b/neutronclient/openstack/common/strutils.py
index 536779113..b2e4dcb35 100644
--- a/neutronclient/openstack/common/strutils.py
+++ b/neutronclient/openstack/common/strutils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation.
 # All Rights Reserved.
 #
diff --git a/neutronclient/openstack/common/timeutils.py b/neutronclient/openstack/common/timeutils.py
index aa9f70807..14fc4fbd8 100644
--- a/neutronclient/openstack/common/timeutils.py
+++ b/neutronclient/openstack/common/timeutils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation.
 # All Rights Reserved.
 #
diff --git a/neutronclient/shell.py b/neutronclient/shell.py
index e5596d722..971860446 100644
--- a/neutronclient/shell.py
+++ b/neutronclient/shell.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 """
 Command-line interface to the Neutron APIs
diff --git a/neutronclient/tests/unit/fw/test_cli20_firewall.py b/neutronclient/tests/unit/fw/test_cli20_firewall.py
index 2d1d567b3..1d24a3342 100644
--- a/neutronclient/tests/unit/fw/test_cli20_firewall.py
+++ b/neutronclient/tests/unit/fw/test_cli20_firewall.py
@@ -15,7 +15,6 @@
 #
 # @author: KC Wang, Big Switch Networks Inc.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import sys
 
diff --git a/neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py b/neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py
index 7be066e8b..d217c91ce 100644
--- a/neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py
+++ b/neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py
@@ -15,7 +15,6 @@
 #
 # @author: KC Wang, Big Switch Networks Inc.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import sys
 
diff --git a/neutronclient/tests/unit/fw/test_cli20_firewallrule.py b/neutronclient/tests/unit/fw/test_cli20_firewallrule.py
index a6acebad0..30c8a0fd5 100644
--- a/neutronclient/tests/unit/fw/test_cli20_firewallrule.py
+++ b/neutronclient/tests/unit/fw/test_cli20_firewallrule.py
@@ -15,7 +15,6 @@
 #
 # @author: KC Wang, Big Switch Networks Inc.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import sys
 
diff --git a/neutronclient/tests/unit/lb/test_cli20_healthmonitor.py b/neutronclient/tests/unit/lb/test_cli20_healthmonitor.py
index 959bd98bf..ab2986e43 100644
--- a/neutronclient/tests/unit/lb/test_cli20_healthmonitor.py
+++ b/neutronclient/tests/unit/lb/test_cli20_healthmonitor.py
@@ -15,7 +15,6 @@
 #
 # @author: Ilya Shakhat, Mirantis Inc.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import sys
 
diff --git a/neutronclient/tests/unit/lb/test_cli20_member.py b/neutronclient/tests/unit/lb/test_cli20_member.py
index ff0bc8ca1..b3f4cc87b 100644
--- a/neutronclient/tests/unit/lb/test_cli20_member.py
+++ b/neutronclient/tests/unit/lb/test_cli20_member.py
@@ -15,7 +15,6 @@
 #
 # @author: Ilya Shakhat, Mirantis Inc.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import sys
 
diff --git a/neutronclient/tests/unit/lb/test_cli20_pool.py b/neutronclient/tests/unit/lb/test_cli20_pool.py
index 1c0203d71..d0acf4a23 100644
--- a/neutronclient/tests/unit/lb/test_cli20_pool.py
+++ b/neutronclient/tests/unit/lb/test_cli20_pool.py
@@ -15,7 +15,6 @@
 #
 # @author: Ilya Shakhat, Mirantis Inc.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import sys
 
diff --git a/neutronclient/tests/unit/lb/test_cli20_vip.py b/neutronclient/tests/unit/lb/test_cli20_vip.py
index 332cc813a..fb501415e 100644
--- a/neutronclient/tests/unit/lb/test_cli20_vip.py
+++ b/neutronclient/tests/unit/lb/test_cli20_vip.py
@@ -15,7 +15,6 @@
 #
 # @author: Ilya Shakhat, Mirantis Inc.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import sys
 
diff --git a/neutronclient/tests/unit/test_auth.py b/neutronclient/tests/unit/test_auth.py
index 9fa9e56b6..60187fdbd 100644
--- a/neutronclient/tests/unit/test_auth.py
+++ b/neutronclient/tests/unit/test_auth.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import copy
 import httplib2
diff --git a/neutronclient/tests/unit/test_casual_args.py b/neutronclient/tests/unit/test_casual_args.py
index 2dfaae6e7..fe7a67d3b 100644
--- a/neutronclient/tests/unit/test_casual_args.py
+++ b/neutronclient/tests/unit/test_casual_args.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import testtools
 
diff --git a/neutronclient/tests/unit/test_cli20.py b/neutronclient/tests/unit/test_cli20.py
index 2153c5323..836dd545f 100644
--- a/neutronclient/tests/unit/test_cli20.py
+++ b/neutronclient/tests/unit/test_cli20.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import urllib
 
diff --git a/neutronclient/tests/unit/test_cli20_agenschedulers.py b/neutronclient/tests/unit/test_cli20_agenschedulers.py
index d4a32c271..c0a807053 100644
--- a/neutronclient/tests/unit/test_cli20_agenschedulers.py
+++ b/neutronclient/tests/unit/test_cli20_agenschedulers.py
@@ -15,7 +15,6 @@
 #
 # @author: Oleg Bondarev, Mirantis Inc.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import sys
 
diff --git a/neutronclient/tests/unit/test_cli20_credential.py b/neutronclient/tests/unit/test_cli20_credential.py
index ca1bed6af..53e8ecc8a 100644
--- a/neutronclient/tests/unit/test_cli20_credential.py
+++ b/neutronclient/tests/unit/test_cli20_credential.py
@@ -15,7 +15,6 @@
 #
 # @author: Kyle Mestery, Cisco Systems, Inc.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import sys
 
diff --git a/neutronclient/tests/unit/test_cli20_extensions.py b/neutronclient/tests/unit/test_cli20_extensions.py
index a64cc9a09..05bd066c0 100644
--- a/neutronclient/tests/unit/test_cli20_extensions.py
+++ b/neutronclient/tests/unit/test_cli20_extensions.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 NEC Corporation
 # All Rights Reserved.
 #
diff --git a/neutronclient/tests/unit/test_cli20_floatingips.py b/neutronclient/tests/unit/test_cli20_floatingips.py
index d5b986400..3a98e2cf6 100644
--- a/neutronclient/tests/unit/test_cli20_floatingips.py
+++ b/neutronclient/tests/unit/test_cli20_floatingips.py
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Red Hat
 # All Rights Reserved.
 #
diff --git a/neutronclient/tests/unit/test_cli20_network.py b/neutronclient/tests/unit/test_cli20_network.py
index cd1b02f86..fc9a6260f 100644
--- a/neutronclient/tests/unit/test_cli20_network.py
+++ b/neutronclient/tests/unit/test_cli20_network.py
@@ -12,7 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import sys
 
diff --git a/neutronclient/tests/unit/test_cli20_networkprofile.py b/neutronclient/tests/unit/test_cli20_networkprofile.py
index e96a2c62e..21e386282 100644
--- a/neutronclient/tests/unit/test_cli20_networkprofile.py
+++ b/neutronclient/tests/unit/test_cli20_networkprofile.py
@@ -15,7 +15,6 @@
 #
 # @author: Kyle Mestery, Cisco Systems, Inc.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import sys
 
diff --git a/neutronclient/tests/unit/test_cli20_nsx_networkgateway.py b/neutronclient/tests/unit/test_cli20_nsx_networkgateway.py
index a148645fa..14a775725 100644
--- a/neutronclient/tests/unit/test_cli20_nsx_networkgateway.py
+++ b/neutronclient/tests/unit/test_cli20_nsx_networkgateway.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import sys
 
diff --git a/neutronclient/tests/unit/test_cli20_nsx_queue.py b/neutronclient/tests/unit/test_cli20_nsx_queue.py
index ebcd9278a..f65087347 100644
--- a/neutronclient/tests/unit/test_cli20_nsx_queue.py
+++ b/neutronclient/tests/unit/test_cli20_nsx_queue.py
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 VMware Inc.
 # All Rights Reserved.
 #
diff --git a/neutronclient/tests/unit/test_cli20_policyprofile.py b/neutronclient/tests/unit/test_cli20_policyprofile.py
index 3ff560373..791b840ba 100644
--- a/neutronclient/tests/unit/test_cli20_policyprofile.py
+++ b/neutronclient/tests/unit/test_cli20_policyprofile.py
@@ -15,7 +15,6 @@
 #
 # @author: Kyle Mestery, Cisco Systems, Inc.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import sys
 
diff --git a/neutronclient/tests/unit/test_cli20_port.py b/neutronclient/tests/unit/test_cli20_port.py
index 1d7f80b50..b9214088f 100644
--- a/neutronclient/tests/unit/test_cli20_port.py
+++ b/neutronclient/tests/unit/test_cli20_port.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import sys
 
diff --git a/neutronclient/tests/unit/test_cli20_router.py b/neutronclient/tests/unit/test_cli20_router.py
index a0d92614f..274819ce2 100644
--- a/neutronclient/tests/unit/test_cli20_router.py
+++ b/neutronclient/tests/unit/test_cli20_router.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import sys
 
diff --git a/neutronclient/tests/unit/test_cli20_securitygroup.py b/neutronclient/tests/unit/test_cli20_securitygroup.py
index 85c3be643..3ffd0232b 100644
--- a/neutronclient/tests/unit/test_cli20_securitygroup.py
+++ b/neutronclient/tests/unit/test_cli20_securitygroup.py
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Red Hat
 # All Rights Reserved.
 #
diff --git a/neutronclient/tests/unit/test_cli20_servicetype.py b/neutronclient/tests/unit/test_cli20_servicetype.py
index 7f6afb534..0429a1a44 100644
--- a/neutronclient/tests/unit/test_cli20_servicetype.py
+++ b/neutronclient/tests/unit/test_cli20_servicetype.py
@@ -15,7 +15,6 @@
 #
 # @author: Eugene Nikanorov, Mirantis Inc.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import sys
 
diff --git a/neutronclient/tests/unit/test_cli20_subnet.py b/neutronclient/tests/unit/test_cli20_subnet.py
index 6d796f8bc..57b5901fc 100644
--- a/neutronclient/tests/unit/test_cli20_subnet.py
+++ b/neutronclient/tests/unit/test_cli20_subnet.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import sys
 
diff --git a/neutronclient/tests/unit/test_http.py b/neutronclient/tests/unit/test_http.py
index 910944a84..1e66a2b34 100644
--- a/neutronclient/tests/unit/test_http.py
+++ b/neutronclient/tests/unit/test_http.py
@@ -12,7 +12,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import httplib2
 import mox
diff --git a/neutronclient/tests/unit/test_name_or_id.py b/neutronclient/tests/unit/test_name_or_id.py
index f0974401d..a6c654d3a 100644
--- a/neutronclient/tests/unit/test_name_or_id.py
+++ b/neutronclient/tests/unit/test_name_or_id.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import uuid
 
diff --git a/neutronclient/tests/unit/test_quota.py b/neutronclient/tests/unit/test_quota.py
index da4f3c9cc..5364a412e 100644
--- a/neutronclient/tests/unit/test_quota.py
+++ b/neutronclient/tests/unit/test_quota.py
@@ -13,7 +13,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import sys
 
diff --git a/neutronclient/tests/unit/test_shell.py b/neutronclient/tests/unit/test_shell.py
index a3ac68bbc..23f1d2dfc 100644
--- a/neutronclient/tests/unit/test_shell.py
+++ b/neutronclient/tests/unit/test_shell.py
@@ -12,7 +12,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import argparse
 import cStringIO
diff --git a/neutronclient/tests/unit/test_ssl.py b/neutronclient/tests/unit/test_ssl.py
index d7154d74e..0fefb7868 100644
--- a/neutronclient/tests/unit/test_ssl.py
+++ b/neutronclient/tests/unit/test_ssl.py
@@ -12,7 +12,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import fixtures
 import httplib2
diff --git a/neutronclient/tests/unit/test_utils.py b/neutronclient/tests/unit/test_utils.py
index 69facdcd4..002ef07a7 100644
--- a/neutronclient/tests/unit/test_utils.py
+++ b/neutronclient/tests/unit/test_utils.py
@@ -12,7 +12,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import datetime
 import sys
diff --git a/neutronclient/tests/unit/vpn/__init__.py b/neutronclient/tests/unit/vpn/__init__.py
index 9850e2ce2..90ae7d5fa 100644
--- a/neutronclient/tests/unit/vpn/__init__.py
+++ b/neutronclient/tests/unit/vpn/__init__.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #    All Rights Reserved.
 #
diff --git a/neutronclient/tests/unit/vpn/test_cli20_ikepolicy.py b/neutronclient/tests/unit/vpn/test_cli20_ikepolicy.py
index 688e6f52d..fc5a1a4d0 100644
--- a/neutronclient/tests/unit/vpn/test_cli20_ikepolicy.py
+++ b/neutronclient/tests/unit/vpn/test_cli20_ikepolicy.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #    All Rights Reserved.
 #
diff --git a/neutronclient/tests/unit/vpn/test_cli20_ipsec_site_connection.py b/neutronclient/tests/unit/vpn/test_cli20_ipsec_site_connection.py
index 558275320..077db1e16 100644
--- a/neutronclient/tests/unit/vpn/test_cli20_ipsec_site_connection.py
+++ b/neutronclient/tests/unit/vpn/test_cli20_ipsec_site_connection.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #    All Rights Reserved.
 #
diff --git a/neutronclient/tests/unit/vpn/test_cli20_ipsecpolicy.py b/neutronclient/tests/unit/vpn/test_cli20_ipsecpolicy.py
index 89062c82b..ca413a053 100644
--- a/neutronclient/tests/unit/vpn/test_cli20_ipsecpolicy.py
+++ b/neutronclient/tests/unit/vpn/test_cli20_ipsecpolicy.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #    All Rights Reserved.
 #
diff --git a/neutronclient/tests/unit/vpn/test_cli20_vpnservice.py b/neutronclient/tests/unit/vpn/test_cli20_vpnservice.py
index e872cc9b2..8afd081dc 100644
--- a/neutronclient/tests/unit/vpn/test_cli20_vpnservice.py
+++ b/neutronclient/tests/unit/vpn/test_cli20_vpnservice.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #    All Rights Reserved.
 #
diff --git a/neutronclient/tests/unit/vpn/test_utils.py b/neutronclient/tests/unit/vpn/test_utils.py
index 18c0241f2..7b815a55a 100644
--- a/neutronclient/tests/unit/vpn/test_utils.py
+++ b/neutronclient/tests/unit/vpn/test_utils.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
 #    (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
 #    All Rights Reserved.
 #
diff --git a/neutronclient/v2_0/client.py b/neutronclient/v2_0/client.py
index 80e139c76..99ff6e2f9 100644
--- a/neutronclient/v2_0/client.py
+++ b/neutronclient/v2_0/client.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 import httplib
 import logging