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
2014-02-10 17:00:28 +08:00
parent a7e2bd3324
commit e955a1fc80
80 changed files with 0 additions and 109 deletions
--- 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.
 #
--- 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
--- 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.
 """
--- 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
--- 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.
 #
--- 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
 ###
--- 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
--- 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
--- 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
--- 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

--- 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

--- 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

--- 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

--- 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
--- 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
--- 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
--- 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
--- 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

--- 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

--- 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

--- 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

--- 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
--- 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
--- 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

--- 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
 #
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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.
 #
--- 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.
 #
--- 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.
 #
--- 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.
 #
--- 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.
 #
--- 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.
--- 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.
 #
--- 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
--- 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.
 #
--- 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.
 #
--- 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
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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
--- 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

--- 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

--- 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

--- 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

--- 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.
 #
--- 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.
 #
--- 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

--- 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

--- 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

--- 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.
 #
--- 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

--- 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

--- 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

--- 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.
 #
--- 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

--- 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

--- 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
--- 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

--- 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

--- 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
--- 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
--- 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
--- 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.
 #
--- 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.
 #
--- 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.
 #
--- 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.
 #
--- 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.
 #
--- 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.
 #
--- 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