From e57e5f82af942b7c40cfc4072fa93f07f4be5fa9 Mon Sep 17 00:00:00 2001 From: liu-sheng Date: Thu, 19 Jun 2014 14:26:16 +0800 Subject: [PATCH] Remove the useless vim modelines Change-Id: I41286e0b8f74c90b7078c3d3fb041b6586d95ab0 Closes-Bug: #1229324 --- neutron/__init__.py | 2 -- neutron/db/firewall/__init__.py | 2 -- neutron/db/firewall/firewall_db.py | 2 -- neutron/services/__init__.py | 2 -- neutron/services/firewall/__init__.py | 2 -- neutron/services/firewall/agents/__init__.py | 2 -- neutron/services/firewall/agents/firewall_agent_api.py | 2 -- neutron/services/firewall/agents/l3reference/__init__.py | 2 -- .../services/firewall/agents/l3reference/firewall_l3_agent.py | 2 -- neutron/services/firewall/agents/varmour/__init__.py | 2 -- neutron/services/firewall/agents/varmour/varmour_api.py | 2 -- neutron/services/firewall/agents/varmour/varmour_router.py | 2 -- neutron/services/firewall/agents/varmour/varmour_utils.py | 2 -- neutron/services/firewall/drivers/__init__.py | 2 -- neutron/services/firewall/drivers/fwaas_base.py | 2 -- neutron/services/firewall/drivers/linux/__init__.py | 2 -- neutron/services/firewall/drivers/linux/iptables_fwaas.py | 2 -- neutron/services/firewall/drivers/varmour/__init__.py | 2 -- neutron/services/firewall/drivers/varmour/varmour_fwaas.py | 2 -- neutron/services/firewall/fwaas_plugin.py | 2 -- neutron/tests/unit/__init__.py | 2 -- neutron/tests/unit/db/__init__.py | 2 -- neutron/tests/unit/db/firewall/__init__.py | 2 -- neutron/tests/unit/db/firewall/test_db_firewall.py | 2 -- neutron/tests/unit/services/__init__.py | 2 -- neutron/tests/unit/services/firewall/__init__.py | 2 -- neutron/tests/unit/services/firewall/agents/__init__.py | 2 -- .../tests/unit/services/firewall/agents/l3reference/__init__.py | 2 -- .../firewall/agents/l3reference/test_firewall_l3_agent.py | 2 -- .../unit/services/firewall/agents/test_firewall_agent_api.py | 2 -- neutron/tests/unit/services/firewall/agents/varmour/__init__.py | 2 -- .../services/firewall/agents/varmour/test_varmour_router.py | 2 -- neutron/tests/unit/services/firewall/drivers/__init__.py | 2 -- neutron/tests/unit/services/firewall/drivers/linux/__init__.py | 2 -- .../unit/services/firewall/drivers/linux/test_iptables_fwaas.py | 2 -- .../tests/unit/services/firewall/drivers/varmour/__init__.py | 2 -- .../services/firewall/drivers/varmour/test_varmour_fwaas.py | 2 -- neutron/tests/unit/services/firewall/test_fwaas_plugin.py | 2 -- tools/check_i18n.py | 2 -- tools/install_venv.py | 2 -- tools/install_venv_common.py | 2 -- tools/with_venv.sh | 2 -- 42 files changed, 84 deletions(-) diff --git a/neutron/__init__.py b/neutron/__init__.py index b2c81bde7..710b18c46 100644 --- a/neutron/__init__.py +++ b/neutron/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/neutron/db/firewall/__init__.py b/neutron/db/firewall/__init__.py index d1e364161..f3d0cdefd 100644 --- a/neutron/db/firewall/__init__.py +++ b/neutron/db/firewall/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/neutron/db/firewall/firewall_db.py b/neutron/db/firewall/firewall_db.py index 5636a8cbf..58b930d95 100644 --- a/neutron/db/firewall/firewall_db.py +++ b/neutron/db/firewall/firewall_db.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/services/__init__.py b/neutron/services/__init__.py index 7e503debd..b706747cf 100644 --- a/neutron/services/__init__.py +++ b/neutron/services/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/services/firewall/__init__.py b/neutron/services/firewall/__init__.py index 5e8da711f..a6a8955d8 100644 --- a/neutron/services/firewall/__init__.py +++ b/neutron/services/firewall/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/services/firewall/agents/__init__.py b/neutron/services/firewall/agents/__init__.py index 5e8da711f..a6a8955d8 100644 --- a/neutron/services/firewall/agents/__init__.py +++ b/neutron/services/firewall/agents/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/services/firewall/agents/firewall_agent_api.py b/neutron/services/firewall/agents/firewall_agent_api.py index aad828d41..9bd917d4c 100644 --- a/neutron/services/firewall/agents/firewall_agent_api.py +++ b/neutron/services/firewall/agents/firewall_agent_api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (c) 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/neutron/services/firewall/agents/l3reference/__init__.py b/neutron/services/firewall/agents/l3reference/__init__.py index 5e8da711f..a6a8955d8 100644 --- a/neutron/services/firewall/agents/l3reference/__init__.py +++ b/neutron/services/firewall/agents/l3reference/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py b/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py index 865051835..fbe8c132a 100644 --- a/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py +++ b/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (c) 2013 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/services/firewall/agents/varmour/__init__.py b/neutron/services/firewall/agents/varmour/__init__.py index 5e8da711f..a6a8955d8 100755 --- a/neutron/services/firewall/agents/varmour/__init__.py +++ b/neutron/services/firewall/agents/varmour/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/services/firewall/agents/varmour/varmour_api.py b/neutron/services/firewall/agents/varmour/varmour_api.py index 86cb46fac..7da2002b3 100755 --- a/neutron/services/firewall/agents/varmour/varmour_api.py +++ b/neutron/services/firewall/agents/varmour/varmour_api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 vArmour Networks Inc. # All Rights Reserved. # diff --git a/neutron/services/firewall/agents/varmour/varmour_router.py b/neutron/services/firewall/agents/varmour/varmour_router.py index 952a452b1..e496f119f 100755 --- a/neutron/services/firewall/agents/varmour/varmour_router.py +++ b/neutron/services/firewall/agents/varmour/varmour_router.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 vArmour Networks Inc. # All Rights Reserved. # diff --git a/neutron/services/firewall/agents/varmour/varmour_utils.py b/neutron/services/firewall/agents/varmour/varmour_utils.py index 7290cb6e6..d69733dea 100755 --- a/neutron/services/firewall/agents/varmour/varmour_utils.py +++ b/neutron/services/firewall/agents/varmour/varmour_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 vArmour Networks Inc. # All Rights Reserved. # diff --git a/neutron/services/firewall/drivers/__init__.py b/neutron/services/firewall/drivers/__init__.py index 5e8da711f..a6a8955d8 100644 --- a/neutron/services/firewall/drivers/__init__.py +++ b/neutron/services/firewall/drivers/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/services/firewall/drivers/fwaas_base.py b/neutron/services/firewall/drivers/fwaas_base.py index 0e3fb25a3..e57c7eaa3 100644 --- a/neutron/services/firewall/drivers/fwaas_base.py +++ b/neutron/services/firewall/drivers/fwaas_base.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Dell Inc. # All Rights Reserved. # diff --git a/neutron/services/firewall/drivers/linux/__init__.py b/neutron/services/firewall/drivers/linux/__init__.py index 5e8da711f..a6a8955d8 100644 --- a/neutron/services/firewall/drivers/linux/__init__.py +++ b/neutron/services/firewall/drivers/linux/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/services/firewall/drivers/linux/iptables_fwaas.py b/neutron/services/firewall/drivers/linux/iptables_fwaas.py index 00a3ed792..8dc3fd9f6 100644 --- a/neutron/services/firewall/drivers/linux/iptables_fwaas.py +++ b/neutron/services/firewall/drivers/linux/iptables_fwaas.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Dell Inc. # All Rights Reserved. # diff --git a/neutron/services/firewall/drivers/varmour/__init__.py b/neutron/services/firewall/drivers/varmour/__init__.py index 5e8da711f..a6a8955d8 100755 --- a/neutron/services/firewall/drivers/varmour/__init__.py +++ b/neutron/services/firewall/drivers/varmour/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/services/firewall/drivers/varmour/varmour_fwaas.py b/neutron/services/firewall/drivers/varmour/varmour_fwaas.py index bcdf2f909..57ca02bfc 100755 --- a/neutron/services/firewall/drivers/varmour/varmour_fwaas.py +++ b/neutron/services/firewall/drivers/varmour/varmour_fwaas.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 vArmour Networks Inc. # All Rights Reserved. # diff --git a/neutron/services/firewall/fwaas_plugin.py b/neutron/services/firewall/fwaas_plugin.py index f0eaf1b2c..a63863e99 100644 --- a/neutron/services/firewall/fwaas_plugin.py +++ b/neutron/services/firewall/fwaas_plugin.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/tests/unit/__init__.py b/neutron/tests/unit/__init__.py index 96b119faf..282187de4 100644 --- a/neutron/tests/unit/__init__.py +++ b/neutron/tests/unit/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/tests/unit/db/__init__.py b/neutron/tests/unit/db/__init__.py index cae279d0a..fb181bf62 100644 --- a/neutron/tests/unit/db/__init__.py +++ b/neutron/tests/unit/db/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/neutron/tests/unit/db/firewall/__init__.py b/neutron/tests/unit/db/firewall/__init__.py index cae279d0a..fb181bf62 100644 --- a/neutron/tests/unit/db/firewall/__init__.py +++ b/neutron/tests/unit/db/firewall/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/neutron/tests/unit/db/firewall/test_db_firewall.py b/neutron/tests/unit/db/firewall/test_db_firewall.py index 69cf36483..0470bfd96 100644 --- a/neutron/tests/unit/db/firewall/test_db_firewall.py +++ b/neutron/tests/unit/db/firewall/test_db_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/tests/unit/services/__init__.py b/neutron/tests/unit/services/__init__.py index ce18bf6d6..44391ce44 100644 --- a/neutron/tests/unit/services/__init__.py +++ b/neutron/tests/unit/services/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 New Dream Network, LLC (DreamHost) # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/neutron/tests/unit/services/firewall/__init__.py b/neutron/tests/unit/services/firewall/__init__.py index cae279d0a..fb181bf62 100644 --- a/neutron/tests/unit/services/firewall/__init__.py +++ b/neutron/tests/unit/services/firewall/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/neutron/tests/unit/services/firewall/agents/__init__.py b/neutron/tests/unit/services/firewall/agents/__init__.py index cae279d0a..fb181bf62 100644 --- a/neutron/tests/unit/services/firewall/agents/__init__.py +++ b/neutron/tests/unit/services/firewall/agents/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/neutron/tests/unit/services/firewall/agents/l3reference/__init__.py b/neutron/tests/unit/services/firewall/agents/l3reference/__init__.py index cae279d0a..fb181bf62 100644 --- a/neutron/tests/unit/services/firewall/agents/l3reference/__init__.py +++ b/neutron/tests/unit/services/firewall/agents/l3reference/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/neutron/tests/unit/services/firewall/agents/l3reference/test_firewall_l3_agent.py b/neutron/tests/unit/services/firewall/agents/l3reference/test_firewall_l3_agent.py index 7daffce19..0edc64647 100644 --- a/neutron/tests/unit/services/firewall/agents/l3reference/test_firewall_l3_agent.py +++ b/neutron/tests/unit/services/firewall/agents/l3reference/test_firewall_l3_agent.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (c) 2013 OpenStack Foundation # All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/neutron/tests/unit/services/firewall/agents/test_firewall_agent_api.py b/neutron/tests/unit/services/firewall/agents/test_firewall_agent_api.py index 3b76c5af3..188d3c293 100644 --- a/neutron/tests/unit/services/firewall/agents/test_firewall_agent_api.py +++ b/neutron/tests/unit/services/firewall/agents/test_firewall_agent_api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright (c) 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/neutron/tests/unit/services/firewall/agents/varmour/__init__.py b/neutron/tests/unit/services/firewall/agents/varmour/__init__.py index 5e8da711f..a6a8955d8 100755 --- a/neutron/tests/unit/services/firewall/agents/varmour/__init__.py +++ b/neutron/tests/unit/services/firewall/agents/varmour/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/tests/unit/services/firewall/agents/varmour/test_varmour_router.py b/neutron/tests/unit/services/firewall/agents/varmour/test_varmour_router.py index 6a08e34b2..d77832118 100644 --- a/neutron/tests/unit/services/firewall/agents/varmour/test_varmour_router.py +++ b/neutron/tests/unit/services/firewall/agents/varmour/test_varmour_router.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 vArmour Networks Inc. # All Rights Reserved. # diff --git a/neutron/tests/unit/services/firewall/drivers/__init__.py b/neutron/tests/unit/services/firewall/drivers/__init__.py index cae279d0a..fb181bf62 100644 --- a/neutron/tests/unit/services/firewall/drivers/__init__.py +++ b/neutron/tests/unit/services/firewall/drivers/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/neutron/tests/unit/services/firewall/drivers/linux/__init__.py b/neutron/tests/unit/services/firewall/drivers/linux/__init__.py index cae279d0a..fb181bf62 100644 --- a/neutron/tests/unit/services/firewall/drivers/linux/__init__.py +++ b/neutron/tests/unit/services/firewall/drivers/linux/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/neutron/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py b/neutron/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py index 4bcef20e6..472586547 100644 --- a/neutron/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py +++ b/neutron/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Dell Inc. # All Rights Reserved. # diff --git a/neutron/tests/unit/services/firewall/drivers/varmour/__init__.py b/neutron/tests/unit/services/firewall/drivers/varmour/__init__.py index 5e8da711f..a6a8955d8 100755 --- a/neutron/tests/unit/services/firewall/drivers/varmour/__init__.py +++ b/neutron/tests/unit/services/firewall/drivers/varmour/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation. # All Rights Reserved. # diff --git a/neutron/tests/unit/services/firewall/drivers/varmour/test_varmour_fwaas.py b/neutron/tests/unit/services/firewall/drivers/varmour/test_varmour_fwaas.py index c65af6bc5..46ced6163 100644 --- a/neutron/tests/unit/services/firewall/drivers/varmour/test_varmour_fwaas.py +++ b/neutron/tests/unit/services/firewall/drivers/varmour/test_varmour_fwaas.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 vArmour Networks Inc. # All Rights Reserved. # diff --git a/neutron/tests/unit/services/firewall/test_fwaas_plugin.py b/neutron/tests/unit/services/firewall/test_fwaas_plugin.py index 2430d69c6..512abdb46 100644 --- a/neutron/tests/unit/services/firewall/test_fwaas_plugin.py +++ b/neutron/tests/unit/services/firewall/test_fwaas_plugin.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Big Switch Networks, Inc. # All Rights Reserved. # diff --git a/tools/check_i18n.py b/tools/check_i18n.py index f9b31ebda..697ad180d 100644 --- a/tools/check_i18n.py +++ b/tools/check_i18n.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/tools/install_venv.py b/tools/install_venv.py index df06fa9c6..f8fb8fa29 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -# 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/tools/install_venv_common.py b/tools/install_venv_common.py index b5ec5092f..3e8c1e4a8 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/tools/with_venv.sh b/tools/with_venv.sh index 63f5b9837..dea5c5fc2 100755 --- a/tools/with_venv.sh +++ b/tools/with_venv.sh @@ -1,6 +1,4 @@ #!/bin/bash -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation. # All Rights Reserved. #