From 52db0a385a6e6f302fe4ead8ee6ec6bdbe5db6c3 Mon Sep 17 00:00:00 2001 From: He Yongli Date: Thu, 13 Feb 2014 12:53:24 +0800 Subject: [PATCH] Remove extraneous vim configuration comments Remove vim setting, Remove line containing: comment - # vim: tabstop=4 shiftwidth=4 softtabstop=4 at the top of source code files, except for files in openstack/common. Change-Id: I5e2aad6dca8407890fc3c2afbda541bd4f124ea8 Closes-Bug: #1229324 --- rsdns/__init__.py | 2 -- run_tests.sh | 1 - tools/install_venv.py | 2 -- trove/__init__.py | 2 -- trove/backup/service.py | 2 -- trove/backup/views.py | 2 -- trove/cmd/conductor.py | 1 - trove/cmd/fakemode.py | 1 - trove/cmd/guest.py | 1 - trove/cmd/manage.py | 1 - trove/cmd/taskmanager.py | 1 - trove/common/auth.py | 2 -- trove/common/cfg.py | 2 -- trove/common/context.py | 2 -- trove/common/debug_utils.py | 2 +- trove/common/exception.py | 2 -- trove/common/extensions.py | 2 -- trove/common/instance.py | 2 -- trove/common/models.py | 2 -- trove/common/pagination.py | 2 -- trove/common/remote.py | 2 -- trove/common/rpc/__init__.py | 1 - trove/common/rpc/impl_fake.py | 2 -- trove/common/utils.py | 2 -- trove/common/views.py | 2 -- trove/common/wsgi.py | 2 -- trove/db/__init__.py | 2 -- trove/db/sqlalchemy/api.py | 2 -- trove/db/sqlalchemy/mappers.py | 2 -- trove/db/sqlalchemy/migrate_repo/manage.py | 1 - trove/db/sqlalchemy/migrate_repo/schema.py | 2 -- trove/db/sqlalchemy/migrate_repo/versions/001_base_schema.py | 2 -- trove/db/sqlalchemy/migrate_repo/versions/002_service_images.py | 2 -- .../db/sqlalchemy/migrate_repo/versions/003_service_statuses.py | 2 -- trove/db/sqlalchemy/migrate_repo/versions/004_root_enabled.py | 2 -- trove/db/sqlalchemy/migrate_repo/versions/005_heartbeat.py | 2 -- trove/db/sqlalchemy/migrate_repo/versions/006_dns_records.py | 2 -- trove/db/sqlalchemy/migrate_repo/versions/010_add_usage.py | 2 -- .../migrate_repo/versions/013_add_security_group_artifacts.py | 2 -- trove/db/sqlalchemy/migration.py | 2 -- trove/db/sqlalchemy/session.py | 2 -- trove/dns/driver.py | 2 -- trove/dns/manager.py | 2 -- trove/dns/models.py | 2 -- trove/dns/rsdns/driver.py | 2 -- trove/extensions/account/models.py | 2 -- trove/extensions/mgmt/host/instance/service.py | 2 -- trove/extensions/mgmt/host/models.py | 2 -- trove/extensions/mgmt/host/service.py | 2 -- trove/extensions/mgmt/host/views.py | 2 -- trove/extensions/mgmt/instances/service.py | 2 -- trove/extensions/mgmt/instances/views.py | 2 -- trove/extensions/mgmt/quota/service.py | 2 -- trove/extensions/mgmt/quota/views.py | 2 -- trove/extensions/mgmt/volume/models.py | 2 -- trove/extensions/mgmt/volume/service.py | 2 -- trove/extensions/mgmt/volume/views.py | 2 -- trove/extensions/mysql/models.py | 2 -- trove/extensions/mysql/service.py | 2 -- trove/extensions/mysql/views.py | 2 -- trove/extensions/routes/mgmt.py | 2 -- trove/extensions/routes/mysql.py | 2 -- trove/extensions/routes/security_group.py | 2 -- trove/extensions/security_group/models.py | 2 -- trove/extensions/security_group/service.py | 2 -- trove/extensions/security_group/views.py | 2 -- trove/flavor/models.py | 2 -- trove/flavor/service.py | 2 -- trove/flavor/views.py | 2 -- trove/guestagent/api.py | 2 -- trove/guestagent/common/operating_system.py | 2 -- trove/guestagent/common/sql_query.py | 2 -- trove/guestagent/datastore/service.py | 2 -- trove/guestagent/db/models.py | 2 -- trove/guestagent/dbaas.py | 2 -- trove/guestagent/pkg.py | 2 -- trove/guestagent/service.py | 2 -- trove/guestagent/volume.py | 2 -- trove/instance/models.py | 2 -- trove/instance/service.py | 2 -- trove/instance/views.py | 2 -- trove/limits/service.py | 2 -- trove/limits/views.py | 2 -- trove/openstack/__init__.py | 2 -- trove/quota/quota.py | 2 -- trove/taskmanager/manager.py | 2 -- trove/taskmanager/service.py | 2 -- trove/tests/fakes/__init__.py | 2 -- trove/tests/fakes/common.py | 2 -- trove/tests/fakes/guestagent.py | 2 -- trove/tests/fakes/keystone.py | 2 -- trove/tests/fakes/nova.py | 2 -- trove/tests/unittests/api/test_versions.py | 2 -- trove/tests/unittests/guestagent/test_pkg.py | 2 -- trove/tests/unittests/util/matchers.py | 2 -- trove/tests/util/__init__.py | 2 -- trove/tests/util/client.py | 2 -- trove/tests/util/usage.py | 2 -- trove/version.py | 2 -- trove/versions.py | 2 -- 100 files changed, 1 insertion(+), 191 deletions(-) diff --git a/rsdns/__init__.py b/rsdns/__init__.py index eb664c88f4..96445cd0ae 100644 --- a/rsdns/__init__.py +++ b/rsdns/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/run_tests.sh b/run_tests.sh index d05d274226..94f4777016 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -1,5 +1,4 @@ #!/bin/bash -# vim: tabstop=4 shiftwidth=4 softtabstop=4 set -eu diff --git a/tools/install_venv.py b/tools/install_venv.py index e25bed8202..3af55bce5e 100755 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -1,7 +1,5 @@ #!/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/trove/__init__.py b/trove/__init__.py index b3bc3ec742..8b9fc79ce8 100644 --- a/trove/__init__.py +++ b/trove/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/backup/service.py b/trove/backup/service.py index 6c3a41ef32..6fb52f667d 100644 --- a/trove/backup/service.py +++ b/trove/backup/service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # Copyright 2013 Hewlett-Packard Development Company, L.P. # diff --git a/trove/backup/views.py b/trove/backup/views.py index e212b35c89..f35322e705 100644 --- a/trove/backup/views.py +++ b/trove/backup/views.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/cmd/conductor.py b/trove/cmd/conductor.py index ea5204e79f..0a1eff2b22 100755 --- a/trove/cmd/conductor.py +++ b/trove/cmd/conductor.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2013 Rackspace Hosting # All Rights Reserved. diff --git a/trove/cmd/fakemode.py b/trove/cmd/fakemode.py index 8a5aa61bf2..d16a26d8f4 100755 --- a/trove/cmd/fakemode.py +++ b/trove/cmd/fakemode.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2011 OpenStack Foundation # All Rights Reserved. diff --git a/trove/cmd/guest.py b/trove/cmd/guest.py index 456342a8b4..3731ae7226 100755 --- a/trove/cmd/guest.py +++ b/trove/cmd/guest.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2011 OpenStack Foundation # All Rights Reserved. diff --git a/trove/cmd/manage.py b/trove/cmd/manage.py index ad1bcc5a12..bfe684f664 100755 --- a/trove/cmd/manage.py +++ b/trove/cmd/manage.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2011 OpenStack Foundation # All Rights Reserved. diff --git a/trove/cmd/taskmanager.py b/trove/cmd/taskmanager.py index 2f3d43f049..c7e13696ef 100755 --- a/trove/cmd/taskmanager.py +++ b/trove/cmd/taskmanager.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2011 OpenStack Foundation # All Rights Reserved. diff --git a/trove/common/auth.py b/trove/common/auth.py index bac24ad665..81142f0363 100644 --- a/trove/common/auth.py +++ b/trove/common/auth.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/common/cfg.py b/trove/common/cfg.py index 22a36c9ebc..45eba1deed 100644 --- a/trove/common/cfg.py +++ b/trove/common/cfg.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2014 Rackspace Hosting # All Rights Reserved. diff --git a/trove/common/context.py b/trove/common/context.py index 014aa50c58..be9f965232 100644 --- a/trove/common/context.py +++ b/trove/common/context.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/common/debug_utils.py b/trove/common/debug_utils.py index 78582d58e6..3b1b5001a4 100644 --- a/trove/common/debug_utils.py +++ b/trove/common/debug_utils.py @@ -1,4 +1,4 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 Copyright 2011 OpenStack Foundation +# Copyright 2011 OpenStack Foundation # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/trove/common/exception.py b/trove/common/exception.py index 9dcad5aec2..5fac900456 100644 --- a/trove/common/exception.py +++ b/trove/common/exception.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/common/extensions.py b/trove/common/extensions.py index 22ec04e189..e68e63c243 100644 --- a/trove/common/extensions.py +++ b/trove/common/extensions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/common/instance.py b/trove/common/instance.py index c691026869..29a30678fd 100644 --- a/trove/common/instance.py +++ b/trove/common/instance.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/common/models.py b/trove/common/models.py index 84bff2e893..9f87c226a7 100644 --- a/trove/common/models.py +++ b/trove/common/models.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/common/pagination.py b/trove/common/pagination.py index 1aac438ca3..eee36be776 100644 --- a/trove/common/pagination.py +++ b/trove/common/pagination.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/common/remote.py b/trove/common/remote.py index a8c2da2f27..7f7a403d64 100644 --- a/trove/common/remote.py +++ b/trove/common/remote.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2012 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/common/rpc/__init__.py b/trove/common/rpc/__init__.py index 8a395d1c11..d117c9af29 100644 --- a/trove/common/rpc/__init__.py +++ b/trove/common/rpc/__init__.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2011 OpenStack Foundation # All Rights Reserved. diff --git a/trove/common/rpc/impl_fake.py b/trove/common/rpc/impl_fake.py index 0b5b0fe8b9..c7852cc9a1 100644 --- a/trove/common/rpc/impl_fake.py +++ b/trove/common/rpc/impl_fake.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/common/utils.py b/trove/common/utils.py index 3db2a3ba40..b663df453d 100644 --- a/trove/common/utils.py +++ b/trove/common/utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/common/views.py b/trove/common/views.py index b00b607adb..677d097760 100644 --- a/trove/common/views.py +++ b/trove/common/views.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/common/wsgi.py b/trove/common/wsgi.py index 5868c8683e..9916b39f7e 100644 --- a/trove/common/wsgi.py +++ b/trove/common/wsgi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/db/__init__.py b/trove/db/__init__.py index 3d9e087354..0901d90a64 100644 --- a/trove/db/__init__.py +++ b/trove/db/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/db/sqlalchemy/api.py b/trove/db/sqlalchemy/api.py index e64e525a61..afe03b02ce 100644 --- a/trove/db/sqlalchemy/api.py +++ b/trove/db/sqlalchemy/api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/db/sqlalchemy/mappers.py b/trove/db/sqlalchemy/mappers.py index 0b260f76a9..6c80a5499c 100644 --- a/trove/db/sqlalchemy/mappers.py +++ b/trove/db/sqlalchemy/mappers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/db/sqlalchemy/migrate_repo/manage.py b/trove/db/sqlalchemy/migrate_repo/manage.py index 1654260f10..f61b116a93 100644 --- a/trove/db/sqlalchemy/migrate_repo/manage.py +++ b/trove/db/sqlalchemy/migrate_repo/manage.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2011 OpenStack Foundation # All Rights Reserved. diff --git a/trove/db/sqlalchemy/migrate_repo/schema.py b/trove/db/sqlalchemy/migrate_repo/schema.py index defe519874..3b7bd18f40 100644 --- a/trove/db/sqlalchemy/migrate_repo/schema.py +++ b/trove/db/sqlalchemy/migrate_repo/schema.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/db/sqlalchemy/migrate_repo/versions/001_base_schema.py b/trove/db/sqlalchemy/migrate_repo/versions/001_base_schema.py index 0c0dd05b25..7411345204 100644 --- a/trove/db/sqlalchemy/migrate_repo/versions/001_base_schema.py +++ b/trove/db/sqlalchemy/migrate_repo/versions/001_base_schema.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/db/sqlalchemy/migrate_repo/versions/002_service_images.py b/trove/db/sqlalchemy/migrate_repo/versions/002_service_images.py index 4ad2d07b69..b82eb5c50e 100644 --- a/trove/db/sqlalchemy/migrate_repo/versions/002_service_images.py +++ b/trove/db/sqlalchemy/migrate_repo/versions/002_service_images.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/db/sqlalchemy/migrate_repo/versions/003_service_statuses.py b/trove/db/sqlalchemy/migrate_repo/versions/003_service_statuses.py index 2a0f06350d..76f049558a 100644 --- a/trove/db/sqlalchemy/migrate_repo/versions/003_service_statuses.py +++ b/trove/db/sqlalchemy/migrate_repo/versions/003_service_statuses.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/db/sqlalchemy/migrate_repo/versions/004_root_enabled.py b/trove/db/sqlalchemy/migrate_repo/versions/004_root_enabled.py index bef7bf51d6..6fd6f1266d 100644 --- a/trove/db/sqlalchemy/migrate_repo/versions/004_root_enabled.py +++ b/trove/db/sqlalchemy/migrate_repo/versions/004_root_enabled.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/db/sqlalchemy/migrate_repo/versions/005_heartbeat.py b/trove/db/sqlalchemy/migrate_repo/versions/005_heartbeat.py index 96abc87601..57aa7f7bdf 100644 --- a/trove/db/sqlalchemy/migrate_repo/versions/005_heartbeat.py +++ b/trove/db/sqlalchemy/migrate_repo/versions/005_heartbeat.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/db/sqlalchemy/migrate_repo/versions/006_dns_records.py b/trove/db/sqlalchemy/migrate_repo/versions/006_dns_records.py index 36f14a4ac8..0afd5a8d32 100644 --- a/trove/db/sqlalchemy/migrate_repo/versions/006_dns_records.py +++ b/trove/db/sqlalchemy/migrate_repo/versions/006_dns_records.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/db/sqlalchemy/migrate_repo/versions/010_add_usage.py b/trove/db/sqlalchemy/migrate_repo/versions/010_add_usage.py index f54b2236a4..0e4fdfc2c6 100644 --- a/trove/db/sqlalchemy/migrate_repo/versions/010_add_usage.py +++ b/trove/db/sqlalchemy/migrate_repo/versions/010_add_usage.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/db/sqlalchemy/migrate_repo/versions/013_add_security_group_artifacts.py b/trove/db/sqlalchemy/migrate_repo/versions/013_add_security_group_artifacts.py index 44f0a71e1e..41214032b6 100644 --- a/trove/db/sqlalchemy/migrate_repo/versions/013_add_security_group_artifacts.py +++ b/trove/db/sqlalchemy/migrate_repo/versions/013_add_security_group_artifacts.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/db/sqlalchemy/migration.py b/trove/db/sqlalchemy/migration.py index 6a8fa7f991..068875812a 100644 --- a/trove/db/sqlalchemy/migration.py +++ b/trove/db/sqlalchemy/migration.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/db/sqlalchemy/session.py b/trove/db/sqlalchemy/session.py index 7bf7375679..24b30c6aef 100644 --- a/trove/db/sqlalchemy/session.py +++ b/trove/db/sqlalchemy/session.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/dns/driver.py b/trove/dns/driver.py index f8569a52bb..4b42b31acc 100644 --- a/trove/dns/driver.py +++ b/trove/dns/driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/dns/manager.py b/trove/dns/manager.py index 64a6d9f153..bf632e40ba 100644 --- a/trove/dns/manager.py +++ b/trove/dns/manager.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/dns/models.py b/trove/dns/models.py index 7c8db86533..86562addac 100644 --- a/trove/dns/models.py +++ b/trove/dns/models.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/dns/rsdns/driver.py b/trove/dns/rsdns/driver.py index e05f43bbc9..b444062fd6 100644 --- a/trove/dns/rsdns/driver.py +++ b/trove/dns/rsdns/driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/extensions/account/models.py b/trove/extensions/account/models.py index d1e413a315..1682939d0d 100644 --- a/trove/extensions/account/models.py +++ b/trove/extensions/account/models.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/extensions/mgmt/host/instance/service.py b/trove/extensions/mgmt/host/instance/service.py index 90e57e130b..8e34fafcab 100644 --- a/trove/extensions/mgmt/host/instance/service.py +++ b/trove/extensions/mgmt/host/instance/service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/extensions/mgmt/host/models.py b/trove/extensions/mgmt/host/models.py index 6d76fd5652..afa7902870 100644 --- a/trove/extensions/mgmt/host/models.py +++ b/trove/extensions/mgmt/host/models.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/extensions/mgmt/host/service.py b/trove/extensions/mgmt/host/service.py index 91fc4e1c53..54022efef6 100644 --- a/trove/extensions/mgmt/host/service.py +++ b/trove/extensions/mgmt/host/service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/extensions/mgmt/host/views.py b/trove/extensions/mgmt/host/views.py index 01e20bdbb6..0c356809ad 100644 --- a/trove/extensions/mgmt/host/views.py +++ b/trove/extensions/mgmt/host/views.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/extensions/mgmt/instances/service.py b/trove/extensions/mgmt/instances/service.py index 9b84663ea3..9cf022b4ff 100644 --- a/trove/extensions/mgmt/instances/service.py +++ b/trove/extensions/mgmt/instances/service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/extensions/mgmt/instances/views.py b/trove/extensions/mgmt/instances/views.py index c32b28b39f..54a3e64077 100644 --- a/trove/extensions/mgmt/instances/views.py +++ b/trove/extensions/mgmt/instances/views.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/extensions/mgmt/quota/service.py b/trove/extensions/mgmt/quota/service.py index 28c6e31b2c..b18c5d290a 100644 --- a/trove/extensions/mgmt/quota/service.py +++ b/trove/extensions/mgmt/quota/service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/extensions/mgmt/quota/views.py b/trove/extensions/mgmt/quota/views.py index c7c8b033be..e723106383 100644 --- a/trove/extensions/mgmt/quota/views.py +++ b/trove/extensions/mgmt/quota/views.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/extensions/mgmt/volume/models.py b/trove/extensions/mgmt/volume/models.py index 84ee4b3a80..9650d48c1b 100644 --- a/trove/extensions/mgmt/volume/models.py +++ b/trove/extensions/mgmt/volume/models.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/extensions/mgmt/volume/service.py b/trove/extensions/mgmt/volume/service.py index 4ed05cfbf3..e8b589be1f 100644 --- a/trove/extensions/mgmt/volume/service.py +++ b/trove/extensions/mgmt/volume/service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/extensions/mgmt/volume/views.py b/trove/extensions/mgmt/volume/views.py index 064dae69dc..c8bd303260 100644 --- a/trove/extensions/mgmt/volume/views.py +++ b/trove/extensions/mgmt/volume/views.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/extensions/mysql/models.py b/trove/extensions/mysql/models.py index 9a222ba3b4..f47e37cc0f 100644 --- a/trove/extensions/mysql/models.py +++ b/trove/extensions/mysql/models.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/extensions/mysql/service.py b/trove/extensions/mysql/service.py index e61fecb996..272ddb5e5d 100644 --- a/trove/extensions/mysql/service.py +++ b/trove/extensions/mysql/service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/extensions/mysql/views.py b/trove/extensions/mysql/views.py index 7ebdc4e6fc..9e0af15490 100644 --- a/trove/extensions/mysql/views.py +++ b/trove/extensions/mysql/views.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/extensions/routes/mgmt.py b/trove/extensions/routes/mgmt.py index f46b9ec29d..f61870aee8 100644 --- a/trove/extensions/routes/mgmt.py +++ b/trove/extensions/routes/mgmt.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/extensions/routes/mysql.py b/trove/extensions/routes/mysql.py index a40daefd3e..6f0e0b83bb 100644 --- a/trove/extensions/routes/mysql.py +++ b/trove/extensions/routes/mysql.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/extensions/routes/security_group.py b/trove/extensions/routes/security_group.py index c943bbc8f2..8a61984325 100644 --- a/trove/extensions/routes/security_group.py +++ b/trove/extensions/routes/security_group.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/trove/extensions/security_group/models.py b/trove/extensions/security_group/models.py index 839f2f162f..c10076bcc0 100644 --- a/trove/extensions/security_group/models.py +++ b/trove/extensions/security_group/models.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/trove/extensions/security_group/service.py b/trove/extensions/security_group/service.py index 6655f66350..16dfe40dea 100644 --- a/trove/extensions/security_group/service.py +++ b/trove/extensions/security_group/service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/trove/extensions/security_group/views.py b/trove/extensions/security_group/views.py index 45cbd476d3..6a2b82304d 100644 --- a/trove/extensions/security_group/views.py +++ b/trove/extensions/security_group/views.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/trove/flavor/models.py b/trove/flavor/models.py index e5cab6c836..2ea0802c50 100644 --- a/trove/flavor/models.py +++ b/trove/flavor/models.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2012 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/flavor/service.py b/trove/flavor/service.py index 5ed4d85a2f..f3c4b0e835 100644 --- a/trove/flavor/service.py +++ b/trove/flavor/service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2012 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/flavor/views.py b/trove/flavor/views.py index 3cabaa1a4c..43265a8f59 100644 --- a/trove/flavor/views.py +++ b/trove/flavor/views.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2012 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/guestagent/api.py b/trove/guestagent/api.py index 285e98e2b1..700062c874 100644 --- a/trove/guestagent/api.py +++ b/trove/guestagent/api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/guestagent/common/operating_system.py b/trove/guestagent/common/operating_system.py index 3b444b7c52..a24f859304 100644 --- a/trove/guestagent/common/operating_system.py +++ b/trove/guestagent/common/operating_system.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/guestagent/common/sql_query.py b/trove/guestagent/common/sql_query.py index ad2d9489a2..66e1833a43 100644 --- a/trove/guestagent/common/sql_query.py +++ b/trove/guestagent/common/sql_query.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/guestagent/datastore/service.py b/trove/guestagent/datastore/service.py index 76bb1e3691..81dae9a7ae 100644 --- a/trove/guestagent/datastore/service.py +++ b/trove/guestagent/datastore/service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/guestagent/db/models.py b/trove/guestagent/db/models.py index 766b53fbd2..5281676a28 100644 --- a/trove/guestagent/db/models.py +++ b/trove/guestagent/db/models.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/guestagent/dbaas.py b/trove/guestagent/dbaas.py index 646c0155f3..4c55df29ca 100644 --- a/trove/guestagent/dbaas.py +++ b/trove/guestagent/dbaas.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/guestagent/pkg.py b/trove/guestagent/pkg.py index d676ea847a..080a7487ae 100644 --- a/trove/guestagent/pkg.py +++ b/trove/guestagent/pkg.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/guestagent/service.py b/trove/guestagent/service.py index 48d88ea0bd..ac2a1bfc18 100644 --- a/trove/guestagent/service.py +++ b/trove/guestagent/service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/guestagent/volume.py b/trove/guestagent/volume.py index 9c65c13168..b5487b7cb7 100644 --- a/trove/guestagent/volume.py +++ b/trove/guestagent/volume.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/instance/models.py b/trove/instance/models.py index 92a19e7528..9842d96a1e 100644 --- a/trove/instance/models.py +++ b/trove/instance/models.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # Copyright 2013-2014 Rackspace Hosting # All Rights Reserved. diff --git a/trove/instance/service.py b/trove/instance/service.py index 5d0575e461..f7e01fa1b5 100644 --- a/trove/instance/service.py +++ b/trove/instance/service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/instance/views.py b/trove/instance/views.py index 70cc068a44..4dc39046d2 100644 --- a/trove/instance/views.py +++ b/trove/instance/views.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/limits/service.py b/trove/limits/service.py index 1918aba483..354cdea5b0 100644 --- a/trove/limits/service.py +++ b/trove/limits/service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # Copyright 2013 Hewlett-Packard Development Company, L.P. # diff --git a/trove/limits/views.py b/trove/limits/views.py index 294a43d5b2..da599f05e7 100644 --- a/trove/limits/views.py +++ b/trove/limits/views.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/openstack/__init__.py b/trove/openstack/__init__.py index 4dec227c40..31285c4fc2 100644 --- a/trove/openstack/__init__.py +++ b/trove/openstack/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/quota/quota.py b/trove/quota/quota.py index abf426460a..4bf7344343 100644 --- a/trove/quota/quota.py +++ b/trove/quota/quota.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/taskmanager/manager.py b/trove/taskmanager/manager.py index 78cca4d9c9..9c3b645378 100644 --- a/trove/taskmanager/manager.py +++ b/trove/taskmanager/manager.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/taskmanager/service.py b/trove/taskmanager/service.py index f0ccb27ae4..d3651783d3 100644 --- a/trove/taskmanager/service.py +++ b/trove/taskmanager/service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/tests/fakes/__init__.py b/trove/tests/fakes/__init__.py index aca7f89f1f..14e24615b6 100644 --- a/trove/tests/fakes/__init__.py +++ b/trove/tests/fakes/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/tests/fakes/common.py b/trove/tests/fakes/common.py index dd5a31e365..be60d8f254 100644 --- a/trove/tests/fakes/common.py +++ b/trove/tests/fakes/common.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/tests/fakes/guestagent.py b/trove/tests/fakes/guestagent.py index be1ae13b0b..ce3bf3ef42 100644 --- a/trove/tests/fakes/guestagent.py +++ b/trove/tests/fakes/guestagent.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2012 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/tests/fakes/keystone.py b/trove/tests/fakes/keystone.py index 06bc8fd973..e7db8480d1 100644 --- a/trove/tests/fakes/keystone.py +++ b/trove/tests/fakes/keystone.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2012 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/tests/fakes/nova.py b/trove/tests/fakes/nova.py index cce2ce2f1e..e82ec285a4 100644 --- a/trove/tests/fakes/nova.py +++ b/trove/tests/fakes/nova.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2012 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/tests/unittests/api/test_versions.py b/trove/tests/unittests/api/test_versions.py index 91cf2d916b..ea588f098f 100644 --- a/trove/tests/unittests/api/test_versions.py +++ b/trove/tests/unittests/api/test_versions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # Copyright 2013 Hewlett-Packard Development Company, L.P. # diff --git a/trove/tests/unittests/guestagent/test_pkg.py b/trove/tests/unittests/guestagent/test_pkg.py index a7a98d6bdc..384e9db69b 100644 --- a/trove/tests/unittests/guestagent/test_pkg.py +++ b/trove/tests/unittests/guestagent/test_pkg.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/tests/unittests/util/matchers.py b/trove/tests/unittests/util/matchers.py index 12dde055a1..d00e8e945b 100644 --- a/trove/tests/unittests/util/matchers.py +++ b/trove/tests/unittests/util/matchers.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 2012 Hewlett-Packard Development Company, L.P. diff --git a/trove/tests/util/__init__.py b/trove/tests/util/__init__.py index b0eb4d57b1..9042543ff3 100644 --- a/trove/tests/util/__init__.py +++ b/trove/tests/util/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/tests/util/client.py b/trove/tests/util/client.py index 3b8180adb3..5d1eb345c5 100644 --- a/trove/tests/util/client.py +++ b/trove/tests/util/client.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/tests/util/usage.py b/trove/tests/util/usage.py index 4f585b5401..868557dded 100644 --- a/trove/tests/util/usage.py +++ b/trove/tests/util/usage.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Rackspace Hosting # All Rights Reserved. # diff --git a/trove/version.py b/trove/version.py index 62905c2846..33656d8f12 100644 --- a/trove/version.py +++ b/trove/version.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/trove/versions.py b/trove/versions.py index 01779eecdc..4f8ac8b4f1 100644 --- a/trove/versions.py +++ b/trove/versions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. #