Merge "Remove extraneous vim configuration comments"

2014-02-27 10:00:05 +00:00 · 2014-02-27 10:00:05 +00:00 · d745a60c35
commit d745a60c35
parent 9527bbd53b 52db0a385a
100 changed files with 1 additions and 191 deletions
--- 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.
 #
--- a/run_tests.sh
+++ b/run_tests.sh
@ -1,5 +1,4 @@
 #!/bin/bash
-# vim: tabstop=4 shiftwidth=4 softtabstop=4

 set -eu

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