Remove vim header

No need to set tabstop tons of times, this can be set in your vimrc file instead. More disucssion: http://openstack.10931.n7.nabble.com/Remove-vim-modelines-td21780.html Change-Id: I3b830a5bb831a63c188109e6fad66ba48884fff3 Partial-Bug: #1229324
2014-01-14 15:56:33 +00:00 · 2014-01-14 15:56:33 +00:00 · 8de10b0f34
commit 8de10b0f34
parent 7834f97bba
178 changed files with 0 additions and 342 deletions
--- a/glance/api/init.py
+++ b/glance/api/init.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011-2012 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/api/cached_images.py
+++ b/glance/api/cached_images.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/api/middleware/cache.py
+++ b/glance/api/middleware/cache.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/api/middleware/cache_manage.py
+++ b/glance/api/middleware/cache_manage.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/api/middleware/context.py
+++ b/glance/api/middleware/context.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011-2012 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/api/middleware/gzip.py
+++ b/glance/api/middleware/gzip.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
--- a/glance/api/middleware/version_negotiation.py
+++ b/glance/api/middleware/version_negotiation.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/api/policy.py
+++ b/glance/api/policy.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 # Copyright 2013 IBM Corp.
 # All Rights Reserved.
--- a/glance/api/property_protections.py
+++ b/glance/api/property_protections.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright 2013 Rackspace
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/api/v1/init.py
+++ b/glance/api/v1/init.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/api/v1/controller.py
+++ b/glance/api/v1/controller.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/api/v1/filters.py
+++ b/glance/api/v1/filters.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012, Piston Cloud Computing, Inc.
 # All Rights Reserved.
 #
--- a/glance/api/v1/images.py
+++ b/glance/api/v1/images.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/api/v1/members.py
+++ b/glance/api/v1/members.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation.
 # Copyright 2013 NTT corp.
 # All Rights Reserved.
--- a/glance/api/v1/router.py
+++ b/glance/api/v1/router.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/api/v1/upload_utils.py
+++ b/glance/api/v1/upload_utils.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/api/v2/router.py
+++ b/glance/api/v2/router.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
--- a/glance/api/v2/tasks.py
+++ b/glance/api/v2/tasks.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 IBM Corp.
 # All Rights Reserved.
 #
--- a/glance/api/versions.py
+++ b/glance/api/versions.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
--- a/glance/cmd/init.py
+++ b/glance/cmd/init.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/cmd/api.py
+++ b/glance/cmd/api.py
@ -1,5 +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.
--- a/glance/cmd/cache_cleaner.py
+++ b/glance/cmd/cache_cleaner.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 OpenStack Foundation
--- a/glance/cmd/cache_manage.py
+++ b/glance/cmd/cache_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/glance/cmd/cache_prefetcher.py
+++ b/glance/cmd/cache_prefetcher.py
@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4

 # Copyright 2011-2012 OpenStack Foundation
 # All Rights Reserved.
--- a/glance/cmd/cache_pruner.py
+++ b/glance/cmd/cache_pruner.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 OpenStack Foundation
--- a/glance/cmd/control.py
+++ b/glance/cmd/control.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright (c) 2011 OpenStack Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
--- a/glance/cmd/manage.py
+++ b/glance/cmd/manage.py
@ -1,5 +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.
--- a/glance/cmd/registry.py
+++ b/glance/cmd/registry.py
@ -1,5 +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.
--- a/glance/cmd/replicator.py
+++ b/glance/cmd/replicator.py
@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4

 # Copyright 2012 Michael Still and Canonical Inc
 # All Rights Reserved.
--- a/glance/cmd/scrubber.py
+++ b/glance/cmd/scrubber.py
@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4

 # Copyright 2011-2012 OpenStack Foundation
 # All Rights Reserved.
--- a/glance/common/auth.py
+++ b/glance/common/auth.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/common/client.py
+++ b/glance/common/client.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/common/config.py
+++ b/glance/common/config.py
@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4

 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
--- a/glance/common/crypt.py
+++ b/glance/common/crypt.py
@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4

 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
--- a/glance/common/exception.py
+++ b/glance/common/exception.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.
 # All Rights Reserved.
--- a/glance/common/property_utils.py
+++ b/glance/common/property_utils.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright 2013 Rackspace
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/common/rpc.py
+++ b/glance/common/rpc.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
--- a/glance/common/utils.py
+++ b/glance/common/utils.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.
 # All Rights Reserved.
--- a/glance/common/wsgi.py
+++ b/glance/common/wsgi.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 2010 OpenStack Foundation
--- a/glance/context.py
+++ b/glance/context.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011-2012 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/init.py
+++ b/glance/db/init.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 2010-2012 OpenStack Foundation
--- a/glance/db/migration.py
+++ b/glance/db/migration.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.
 # All Rights Reserved.
--- a/glance/db/registry/api.py
+++ b/glance/db/registry/api.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/api.py
+++ b/glance/db/sqlalchemy/api.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 2010-2011 OpenStack Foundation
--- a/glance/db/sqlalchemy/migrate_repo/schema.py
+++ b/glance/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/glance/db/sqlalchemy/migrate_repo/versions/001_add_images_table.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/001_add_images_table.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/002_add_image_properties_table.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/002_add_image_properties_table.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/004_add_checksum.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/004_add_checksum.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/005_size_big_integer.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/005_size_big_integer.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/007_add_owner.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/007_add_owner.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/008_add_image_members_table.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/008_add_image_members_table.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/009_add_mindisk_and_minram.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/009_add_mindisk_and_minram.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/010_default_update_at.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/010_default_update_at.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/011_make_mindisk_and_minram_notnull.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/011_make_mindisk_and_minram_notnull.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/012_id_to_uuid.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/012_id_to_uuid.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 IBM Corp.
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
--- a/glance/db/sqlalchemy/migrate_repo/versions/013_add_protected.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/013_add_protected.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 OpenStack Foundation.
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/016_add_status_image_member.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/016_add_status_image_member.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/018_add_image_locations_table.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/018_add_image_locations_table.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/019_migrate_image_locations.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/019_migrate_image_locations.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/020_drop_images_table_location.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/020_drop_images_table_location.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/021_set_engine_mysql_innodb.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/021_set_engine_mysql_innodb.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 # Copyright 2013 IBM Corp.
--- a/glance/db/sqlalchemy/migrate_repo/versions/022_image_member_index.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/022_image_member_index.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/023_placeholder.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/023_placeholder.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
--- a/glance/db/sqlalchemy/migrate_repo/versions/024_placeholder.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/024_placeholder.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
--- a/glance/db/sqlalchemy/migrate_repo/versions/025_placeholder.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/025_placeholder.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
--- a/glance/db/sqlalchemy/migrate_repo/versions/026_add_location_storage_information.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/026_add_location_storage_information.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/027_checksum_index.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/027_checksum_index.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Rackspace Hosting
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/028_owner_index.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/028_owner_index.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Rackspace Hosting
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/029_location_meta_data_pickle_to_string.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/029_location_meta_data_pickle_to_string.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Rackspace Hosting
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/030_add_tasks_table.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/030_add_tasks_table.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 # Copyright 2013 IBM Corp.
--- a/glance/db/sqlalchemy/migrate_repo/versions/031_remove_duplicated_locations.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/031_remove_duplicated_locations.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migrate_repo/versions/032_add_task_info_table.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/032_add_task_info_table.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Rackspace
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/migration.py
+++ b/glance/db/sqlalchemy/migration.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/db/sqlalchemy/models.py
+++ b/glance/db/sqlalchemy/models.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.
 # All Rights Reserved.
--- a/glance/image_cache/init.py
+++ b/glance/image_cache/init.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/image_cache/base.py
+++ b/glance/image_cache/base.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2012 Red Hat, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/image_cache/cleaner.py
+++ b/glance/image_cache/cleaner.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/image_cache/drivers/base.py
+++ b/glance/image_cache/drivers/base.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/image_cache/drivers/sqlite.py
+++ b/glance/image_cache/drivers/sqlite.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/image_cache/drivers/xattr.py
+++ b/glance/image_cache/drivers/xattr.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/image_cache/prefetcher.py
+++ b/glance/image_cache/prefetcher.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/image_cache/pruner.py
+++ b/glance/image_cache/pruner.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/notifier.py
+++ b/glance/notifier.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011, OpenStack Foundation
 # Copyright 2012, Red Hat, Inc.
 # Copyright 2013 IBM Corp.
--- a/glance/quota/init.py
+++ b/glance/quota/init.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013, Red Hat, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/glance/registry/init.py
+++ b/glance/registry/init.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/registry/api/v1/init.py
+++ b/glance/registry/api/v1/init.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/registry/api/v1/images.py
+++ b/glance/registry/api/v1/images.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/registry/api/v1/members.py
+++ b/glance/registry/api/v1/members.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/registry/api/v2/init.py
+++ b/glance/registry/api/v2/init.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
--- a/glance/registry/api/v2/rpc.py
+++ b/glance/registry/api/v2/rpc.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
--- a/glance/registry/client/init.py
+++ b/glance/registry/client/init.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/registry/client/v1/api.py
+++ b/glance/registry/client/v1/api.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/registry/client/v1/client.py
+++ b/glance/registry/client/v1/client.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/glance/registry/client/v2/api.py
+++ b/glance/registry/client/v2/api.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc
 # All Rights Reserved.
 #
--- a/glance/registry/client/v2/client.py
+++ b/glance/registry/client/v2/client.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
--- a/glance/store/init.py
+++ b/glance/store/init.py
@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010-2011 OpenStack Foundation
 # All Rights Reserved.
 #
--- a/Show More
+++ b/Show More