From 8de10b0f34df60494ceaee29daf79427e7a38d82 Mon Sep 17 00:00:00 2001 From: Noboru arai Date: Tue, 14 Jan 2014 15:56:33 +0000 Subject: [PATCH] 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 --- glance/api/__init__.py | 2 -- glance/api/cached_images.py | 2 -- glance/api/middleware/cache.py | 2 -- glance/api/middleware/cache_manage.py | 2 -- glance/api/middleware/context.py | 2 -- glance/api/middleware/gzip.py | 2 -- glance/api/middleware/version_negotiation.py | 2 -- glance/api/policy.py | 2 -- glance/api/property_protections.py | 2 -- glance/api/v1/__init__.py | 2 -- glance/api/v1/controller.py | 2 -- glance/api/v1/filters.py | 2 -- glance/api/v1/images.py | 2 -- glance/api/v1/members.py | 2 -- glance/api/v1/router.py | 2 -- glance/api/v1/upload_utils.py | 2 -- glance/api/v2/router.py | 2 -- glance/api/v2/tasks.py | 2 -- glance/api/versions.py | 2 -- glance/cmd/__init__.py | 2 -- glance/cmd/api.py | 1 - glance/cmd/cache_cleaner.py | 2 -- glance/cmd/cache_manage.py | 1 - glance/cmd/cache_prefetcher.py | 1 - glance/cmd/cache_pruner.py | 2 -- glance/cmd/control.py | 2 -- glance/cmd/manage.py | 1 - glance/cmd/registry.py | 1 - glance/cmd/replicator.py | 1 - glance/cmd/scrubber.py | 1 - glance/common/auth.py | 2 -- glance/common/client.py | 2 -- glance/common/config.py | 1 - glance/common/crypt.py | 1 - glance/common/exception.py | 2 -- glance/common/property_utils.py | 2 -- glance/common/rpc.py | 2 -- glance/common/utils.py | 2 -- glance/common/wsgi.py | 2 -- glance/context.py | 2 -- glance/db/__init__.py | 2 -- glance/db/migration.py | 2 -- glance/db/registry/api.py | 2 -- glance/db/sqlalchemy/api.py | 2 -- glance/db/sqlalchemy/migrate_repo/schema.py | 2 -- .../db/sqlalchemy/migrate_repo/versions/001_add_images_table.py | 2 -- .../migrate_repo/versions/002_add_image_properties_table.py | 2 -- .../db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py | 2 -- glance/db/sqlalchemy/migrate_repo/versions/004_add_checksum.py | 2 -- .../db/sqlalchemy/migrate_repo/versions/005_size_big_integer.py | 2 -- glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py | 2 -- glance/db/sqlalchemy/migrate_repo/versions/007_add_owner.py | 2 -- .../migrate_repo/versions/008_add_image_members_table.py | 2 -- .../migrate_repo/versions/009_add_mindisk_and_minram.py | 2 -- .../sqlalchemy/migrate_repo/versions/010_default_update_at.py | 2 -- .../versions/011_make_mindisk_and_minram_notnull.py | 2 -- glance/db/sqlalchemy/migrate_repo/versions/012_id_to_uuid.py | 2 -- glance/db/sqlalchemy/migrate_repo/versions/013_add_protected.py | 2 -- .../migrate_repo/versions/015_quote_swift_credentials.py | 2 -- .../migrate_repo/versions/016_add_status_image_member.py | 2 -- .../versions/017_quote_encrypted_swift_credentials.py | 2 -- .../migrate_repo/versions/018_add_image_locations_table.py | 2 -- .../migrate_repo/versions/019_migrate_image_locations.py | 2 -- .../migrate_repo/versions/020_drop_images_table_location.py | 2 -- .../migrate_repo/versions/021_set_engine_mysql_innodb.py | 2 -- .../sqlalchemy/migrate_repo/versions/022_image_member_index.py | 2 -- glance/db/sqlalchemy/migrate_repo/versions/023_placeholder.py | 2 -- glance/db/sqlalchemy/migrate_repo/versions/024_placeholder.py | 2 -- glance/db/sqlalchemy/migrate_repo/versions/025_placeholder.py | 2 -- .../versions/026_add_location_storage_information.py | 2 -- .../db/sqlalchemy/migrate_repo/versions/027_checksum_index.py | 2 -- glance/db/sqlalchemy/migrate_repo/versions/028_owner_index.py | 2 -- .../versions/029_location_meta_data_pickle_to_string.py | 2 -- .../db/sqlalchemy/migrate_repo/versions/030_add_tasks_table.py | 2 -- .../migrate_repo/versions/031_remove_duplicated_locations.py | 2 -- .../sqlalchemy/migrate_repo/versions/032_add_task_info_table.py | 2 -- glance/db/sqlalchemy/migration.py | 2 -- glance/db/sqlalchemy/models.py | 2 -- glance/image_cache/__init__.py | 2 -- glance/image_cache/base.py | 2 -- glance/image_cache/cleaner.py | 2 -- glance/image_cache/drivers/base.py | 2 -- glance/image_cache/drivers/sqlite.py | 2 -- glance/image_cache/drivers/xattr.py | 2 -- glance/image_cache/prefetcher.py | 2 -- glance/image_cache/pruner.py | 2 -- glance/notifier.py | 2 -- glance/quota/__init__.py | 2 -- glance/registry/__init__.py | 2 -- glance/registry/api/v1/__init__.py | 2 -- glance/registry/api/v1/images.py | 2 -- glance/registry/api/v1/members.py | 2 -- glance/registry/api/v2/__init__.py | 2 -- glance/registry/api/v2/rpc.py | 2 -- glance/registry/client/__init__.py | 2 -- glance/registry/client/v1/api.py | 2 -- glance/registry/client/v1/client.py | 2 -- glance/registry/client/v2/api.py | 2 -- glance/registry/client/v2/client.py | 2 -- glance/store/__init__.py | 2 -- glance/store/base.py | 2 -- glance/store/cinder.py | 2 -- glance/store/filesystem.py | 2 -- glance/store/gridfs.py | 2 -- glance/store/http.py | 2 -- glance/store/location.py | 2 -- glance/store/rbd.py | 2 -- glance/store/s3.py | 2 -- glance/store/scrubber.py | 2 -- glance/store/sheepdog.py | 2 -- glance/store/swift.py | 2 -- glance/tests/__init__.py | 2 -- glance/tests/functional/__init__.py | 2 -- glance/tests/functional/db/base.py | 2 -- glance/tests/functional/store/__init__.py | 2 -- glance/tests/functional/store/test_cinder.py | 2 -- glance/tests/functional/store/test_filesystem.py | 2 -- glance/tests/functional/store/test_gridfs.py | 2 -- glance/tests/functional/store/test_http.py | 2 -- glance/tests/functional/store/test_rbd.py | 2 -- glance/tests/functional/store/test_s3.py | 2 -- glance/tests/functional/store/test_sheepdog.py | 2 -- glance/tests/functional/store/test_swift.py | 2 -- glance/tests/functional/store_utils.py | 2 -- glance/tests/functional/test_bin_glance_cache_manage.py | 2 -- glance/tests/functional/test_cache_middleware.py | 2 -- glance/tests/functional/test_client_exceptions.py | 2 -- glance/tests/functional/test_client_redirects.py | 2 -- glance/tests/functional/test_glance_manage.py | 2 -- glance/tests/functional/test_gzip_middleware.py | 2 -- glance/tests/functional/test_logging.py | 2 -- glance/tests/functional/test_scrubber.py | 2 -- glance/tests/functional/test_sqlite.py | 2 -- glance/tests/functional/v1/test_api.py | 2 -- glance/tests/functional/v1/test_copy_to_file.py | 2 -- glance/tests/functional/v1/test_misc.py | 2 -- glance/tests/functional/v1/test_multiprocessing.py | 2 -- glance/tests/functional/v1/test_ssl.py | 2 -- glance/tests/functional/v2/test_images.py | 2 -- glance/tests/functional/v2/test_schemas.py | 2 -- glance/tests/functional/v2/test_tasks.py | 2 -- glance/tests/integration/v2/base.py | 2 -- glance/tests/integration/v2/test_tasks_api.py | 2 -- glance/tests/stubs.py | 2 -- glance/tests/unit/api/middleware/test_cache_manage.py | 2 -- glance/tests/unit/api/test_property_protections.py | 2 -- glance/tests/unit/base.py | 2 -- glance/tests/unit/common/test_config.py | 2 -- glance/tests/unit/common/test_exception.py | 2 -- glance/tests/unit/common/test_rpc.py | 1 - glance/tests/unit/common/test_utils.py | 2 -- glance/tests/unit/common/test_wsgi.py | 2 -- glance/tests/unit/test_auth.py | 2 -- glance/tests/unit/test_cached_images.py | 1 - glance/tests/unit/test_cinder_store.py | 2 -- glance/tests/unit/test_context.py | 2 -- glance/tests/unit/test_filesystem_store.py | 2 -- glance/tests/unit/test_glance_replicator.py | 2 -- glance/tests/unit/test_http_store.py | 2 -- glance/tests/unit/test_image_cache.py | 2 -- glance/tests/unit/test_migrations.py | 2 -- glance/tests/unit/test_misc.py | 2 -- glance/tests/unit/test_notifier.py | 2 -- glance/tests/unit/test_s3_store.py | 2 -- glance/tests/unit/test_scrubber.py | 2 -- glance/tests/unit/test_store_base.py | 2 -- glance/tests/unit/test_store_location.py | 2 -- glance/tests/unit/test_swift_store.py | 2 -- glance/tests/unit/test_versions.py | 2 -- glance/tests/unit/v1/test_api.py | 1 - glance/tests/unit/v1/test_registry_api.py | 1 - glance/tests/unit/v1/test_registry_client.py | 2 -- glance/tests/unit/v1/test_upload_utils.py | 2 -- glance/tests/unit/v2/test_registry_api.py | 1 - glance/tests/unit/v2/test_registry_client.py | 2 -- glance/tests/utils.py | 2 -- glance/version.py | 2 -- tools/install_venv.py | 2 -- 178 files changed, 342 deletions(-) diff --git a/glance/api/__init__.py b/glance/api/__init__.py index 496cf050..bd60c19e 100644 --- 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. # diff --git a/glance/api/cached_images.py b/glance/api/cached_images.py index 75be9c62..15d6b45a 100644 --- 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. # diff --git a/glance/api/middleware/cache.py b/glance/api/middleware/cache.py index 2303eacd..89ec8b56 100644 --- 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. # diff --git a/glance/api/middleware/cache_manage.py b/glance/api/middleware/cache_manage.py index 820cf7ee..1697e144 100644 --- 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. # diff --git a/glance/api/middleware/context.py b/glance/api/middleware/context.py index 77340171..ead1712c 100644 --- 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. # diff --git a/glance/api/middleware/gzip.py b/glance/api/middleware/gzip.py index 922800ef..0072f4f7 100644 --- 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. # diff --git a/glance/api/middleware/version_negotiation.py b/glance/api/middleware/version_negotiation.py index 4becba6f..f8ef1d20 100644 --- 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. # diff --git a/glance/api/policy.py b/glance/api/policy.py index 9ee52381..bc804d51 100644 --- 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. diff --git a/glance/api/property_protections.py b/glance/api/property_protections.py index 28a66d4b..9e6ca053 100644 --- 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 diff --git a/glance/api/v1/__init__.py b/glance/api/v1/__init__.py index 892e9c52..74de9aa1 100644 --- 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. # diff --git a/glance/api/v1/controller.py b/glance/api/v1/controller.py index b85f1084..244e4469 100644 --- 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. # diff --git a/glance/api/v1/filters.py b/glance/api/v1/filters.py index 9212626a..a71b13cc 100644 --- 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. # diff --git a/glance/api/v1/images.py b/glance/api/v1/images.py index 94f2d31a..5cd7a116 100644 --- 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. # diff --git a/glance/api/v1/members.py b/glance/api/v1/members.py index 760e20cd..e3bc32b7 100644 --- 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. diff --git a/glance/api/v1/router.py b/glance/api/v1/router.py index 43aecc95..85a27dc7 100644 --- 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. # diff --git a/glance/api/v1/upload_utils.py b/glance/api/v1/upload_utils.py index 8754888b..b6ad8e0c 100644 --- 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. # diff --git a/glance/api/v2/router.py b/glance/api/v2/router.py index f60911e3..5df3a6a6 100644 --- 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. # diff --git a/glance/api/v2/tasks.py b/glance/api/v2/tasks.py index c66ddc65..f5d634da 100644 --- 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. # diff --git a/glance/api/versions.py b/glance/api/versions.py index 23cc7610..82df9114 100644 --- 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. # diff --git a/glance/cmd/__init__.py b/glance/cmd/__init__.py index 44245269..b460b6d1 100644 --- 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. # diff --git a/glance/cmd/api.py b/glance/cmd/api.py index 76a82abe..94753350 100755 --- 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. diff --git a/glance/cmd/cache_cleaner.py b/glance/cmd/cache_cleaner.py index e0535160..42a5c844 100644 --- 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 diff --git a/glance/cmd/cache_manage.py b/glance/cmd/cache_manage.py index 4aab894f..5e604b1e 100755 --- 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. diff --git a/glance/cmd/cache_prefetcher.py b/glance/cmd/cache_prefetcher.py index 2d46597d..0a2c6acb 100755 --- 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. diff --git a/glance/cmd/cache_pruner.py b/glance/cmd/cache_pruner.py index 318c1968..da543dbd 100644 --- 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 diff --git a/glance/cmd/control.py b/glance/cmd/control.py index 60a7707b..2cc69dc4 100644 --- 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"); diff --git a/glance/cmd/manage.py b/glance/cmd/manage.py index 2e5c2205..08a64301 100755 --- 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. diff --git a/glance/cmd/registry.py b/glance/cmd/registry.py index a3d472e0..23623a8c 100755 --- 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. diff --git a/glance/cmd/replicator.py b/glance/cmd/replicator.py index 96e51c67..647837c4 100755 --- 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. diff --git a/glance/cmd/scrubber.py b/glance/cmd/scrubber.py index c010f920..8e2474ee 100755 --- 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. diff --git a/glance/common/auth.py b/glance/common/auth.py index 1d1f4c58..ce4baef7 100644 --- 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. # diff --git a/glance/common/client.py b/glance/common/client.py index 3d4c1bda..8b9644a5 100644 --- 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. # diff --git a/glance/common/config.py b/glance/common/config.py index 6fc09515..3177b073 100644 --- 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. diff --git a/glance/common/crypt.py b/glance/common/crypt.py index ee505442..f719d118 100644 --- 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. diff --git a/glance/common/exception.py b/glance/common/exception.py index ff745c60..eaedc75b 100644 --- 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. diff --git a/glance/common/property_utils.py b/glance/common/property_utils.py index 8a86aa96..6384edff 100644 --- 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 diff --git a/glance/common/rpc.py b/glance/common/rpc.py index 13f99d35..ee5f2580 100644 --- 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. # diff --git a/glance/common/utils.py b/glance/common/utils.py index c0d653a9..51dc55b1 100644 --- 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. diff --git a/glance/common/wsgi.py b/glance/common/wsgi.py index 0df6c876..c9c3f0fd 100644 --- 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 diff --git a/glance/context.py b/glance/context.py index 60cf55fb..89ca3c18 100644 --- 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. # diff --git a/glance/db/__init__.py b/glance/db/__init__.py index d7d9940e..63230cad 100644 --- 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 diff --git a/glance/db/migration.py b/glance/db/migration.py index 1c9ce3f1..25e0c492 100644 --- 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. diff --git a/glance/db/registry/api.py b/glance/db/registry/api.py index 3198fcad..914ba748 100644 --- 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. # diff --git a/glance/db/sqlalchemy/api.py b/glance/db/sqlalchemy/api.py index 3e457d6b..012b086f 100644 --- 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 diff --git a/glance/db/sqlalchemy/migrate_repo/schema.py b/glance/db/sqlalchemy/migrate_repo/schema.py index b941c3db..4fc84e74 100644 --- 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. # diff --git a/glance/db/sqlalchemy/migrate_repo/versions/001_add_images_table.py b/glance/db/sqlalchemy/migrate_repo/versions/001_add_images_table.py index 1e7df307..6d2f46cb 100644 --- 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. # diff --git 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 index 370b09cd..e2a8b34a 100644 --- 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. # diff --git a/glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py b/glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py index 04995148..cbd3a937 100644 --- 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. # diff --git a/glance/db/sqlalchemy/migrate_repo/versions/004_add_checksum.py b/glance/db/sqlalchemy/migrate_repo/versions/004_add_checksum.py index e0612dec..f68343dc 100644 --- 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. # diff --git a/glance/db/sqlalchemy/migrate_repo/versions/005_size_big_integer.py b/glance/db/sqlalchemy/migrate_repo/versions/005_size_big_integer.py index d751b75b..782c182d 100644 --- 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. # diff --git a/glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py b/glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py index 52637fce..0957bb67 100644 --- 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. # diff --git a/glance/db/sqlalchemy/migrate_repo/versions/007_add_owner.py b/glance/db/sqlalchemy/migrate_repo/versions/007_add_owner.py index dcd82875..6d4d7b1f 100644 --- 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. # diff --git 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 index f919b049..491cd4f7 100644 --- 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. # diff --git 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 index 559f5d57..d8250a94 100644 --- 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. # diff --git a/glance/db/sqlalchemy/migrate_repo/versions/010_default_update_at.py b/glance/db/sqlalchemy/migrate_repo/versions/010_default_update_at.py index 1ae09a6e..6d6d43bb 100644 --- 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. # diff --git 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 index 21e0a12d..fe7b0179 100644 --- 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. # diff --git a/glance/db/sqlalchemy/migrate_repo/versions/012_id_to_uuid.py b/glance/db/sqlalchemy/migrate_repo/versions/012_id_to_uuid.py index c95c57f9..b506b0ad 100644 --- 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. diff --git a/glance/db/sqlalchemy/migrate_repo/versions/013_add_protected.py b/glance/db/sqlalchemy/migrate_repo/versions/013_add_protected.py index adc68b50..09219e6e 100644 --- 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. # diff --git a/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py b/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py index 0a58c9e9..5e62004f 100644 --- 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. # diff --git 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 index 3d6e9146..2998df1c 100644 --- 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. # diff --git 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 index a0041aa8..c60bf300 100644 --- 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. # diff --git 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 index a4978c84..782a6208 100644 --- 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. # diff --git a/glance/db/sqlalchemy/migrate_repo/versions/019_migrate_image_locations.py b/glance/db/sqlalchemy/migrate_repo/versions/019_migrate_image_locations.py index adf2b75d..adf853f9 100644 --- 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. # diff --git 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 index ace08a5a..392af57a 100644 --- 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. # diff --git 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 index 7d341251..12a0b68b 100644 --- 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. diff --git a/glance/db/sqlalchemy/migrate_repo/versions/022_image_member_index.py b/glance/db/sqlalchemy/migrate_repo/versions/022_image_member_index.py index 51fcf136..833e6727 100644 --- 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. # diff --git a/glance/db/sqlalchemy/migrate_repo/versions/023_placeholder.py b/glance/db/sqlalchemy/migrate_repo/versions/023_placeholder.py index bf942094..5c63682a 100644 --- 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. diff --git a/glance/db/sqlalchemy/migrate_repo/versions/024_placeholder.py b/glance/db/sqlalchemy/migrate_repo/versions/024_placeholder.py index bf942094..5c63682a 100644 --- 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. diff --git a/glance/db/sqlalchemy/migrate_repo/versions/025_placeholder.py b/glance/db/sqlalchemy/migrate_repo/versions/025_placeholder.py index bf942094..5c63682a 100644 --- 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. diff --git 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 index cea0026e..05970fc2 100644 --- 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. # diff --git a/glance/db/sqlalchemy/migrate_repo/versions/027_checksum_index.py b/glance/db/sqlalchemy/migrate_repo/versions/027_checksum_index.py index 7f40bee1..b74746c0 100644 --- 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. # diff --git a/glance/db/sqlalchemy/migrate_repo/versions/028_owner_index.py b/glance/db/sqlalchemy/migrate_repo/versions/028_owner_index.py index 1bd51a57..73815fa5 100644 --- 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. # diff --git 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 index 3ac85f89..a1b5e2b1 100644 --- 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. # diff --git a/glance/db/sqlalchemy/migrate_repo/versions/030_add_tasks_table.py b/glance/db/sqlalchemy/migrate_repo/versions/030_add_tasks_table.py index 0a728de0..f02521ee 100644 --- 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. diff --git a/glance/db/sqlalchemy/migrate_repo/versions/031_remove_duplicated_locations.py b/glance/db/sqlalchemy/migrate_repo/versions/031_remove_duplicated_locations.py index e48492d3..b38619f8 100644 --- 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. # diff --git 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 index 86053980..b18c58db 100644 --- 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. # diff --git a/glance/db/sqlalchemy/migration.py b/glance/db/sqlalchemy/migration.py index 5cc09f8b..224b0bd8 100644 --- 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. # diff --git a/glance/db/sqlalchemy/models.py b/glance/db/sqlalchemy/models.py index 5a28266a..1d4823b2 100644 --- 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. diff --git a/glance/image_cache/__init__.py b/glance/image_cache/__init__.py index 9a2fc7db..d59931ad 100644 --- 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. # diff --git a/glance/image_cache/base.py b/glance/image_cache/base.py index eb8832cb..e26b49de 100644 --- 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 diff --git a/glance/image_cache/cleaner.py b/glance/image_cache/cleaner.py index bf6b86f9..33ca26d1 100644 --- 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. # diff --git a/glance/image_cache/drivers/base.py b/glance/image_cache/drivers/base.py index 9d489be7..9d72c6f4 100644 --- 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. # diff --git a/glance/image_cache/drivers/sqlite.py b/glance/image_cache/drivers/sqlite.py index 5e8eed98..54929ca2 100644 --- 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. # diff --git a/glance/image_cache/drivers/xattr.py b/glance/image_cache/drivers/xattr.py index 448403a6..dd888834 100644 --- 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. # diff --git a/glance/image_cache/prefetcher.py b/glance/image_cache/prefetcher.py index 0dfad7dd..57c36e9f 100644 --- 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. # diff --git a/glance/image_cache/pruner.py b/glance/image_cache/pruner.py index 141e8a8f..c5d106a5 100644 --- 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. # diff --git a/glance/notifier.py b/glance/notifier.py index 7c68619e..9a95e22a 100644 --- 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. diff --git a/glance/quota/__init__.py b/glance/quota/__init__.py index 459a1c4d..6f3b7eb2 100644 --- 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 diff --git a/glance/registry/__init__.py b/glance/registry/__init__.py index 1293dbf6..ed51e08b 100644 --- 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. # diff --git a/glance/registry/api/v1/__init__.py b/glance/registry/api/v1/__init__.py index 0d121649..496a3d92 100644 --- 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. # diff --git a/glance/registry/api/v1/images.py b/glance/registry/api/v1/images.py index 5829a877..25d5e6db 100644 --- 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. # diff --git a/glance/registry/api/v1/members.py b/glance/registry/api/v1/members.py index a2c4e35a..22e88f52 100644 --- 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. # diff --git a/glance/registry/api/v2/__init__.py b/glance/registry/api/v2/__init__.py index 754ec5ec..70703342 100644 --- 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. # diff --git a/glance/registry/api/v2/rpc.py b/glance/registry/api/v2/rpc.py index 436ad803..faa6b55f 100644 --- 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. # diff --git a/glance/registry/client/__init__.py b/glance/registry/client/__init__.py index 3d56b754..abc91a75 100644 --- 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. # diff --git a/glance/registry/client/v1/api.py b/glance/registry/client/v1/api.py index a6e50e39..2be5dbb3 100644 --- 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. # diff --git a/glance/registry/client/v1/client.py b/glance/registry/client/v1/client.py index 80bb9609..b5f8eca5 100644 --- 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. # diff --git a/glance/registry/client/v2/api.py b/glance/registry/client/v2/api.py index 388a0d2b..e5f3a6b8 100644 --- 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. # diff --git a/glance/registry/client/v2/client.py b/glance/registry/client/v2/client.py index 51c77843..01467ba3 100644 --- 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. # diff --git a/glance/store/__init__.py b/glance/store/__init__.py index c05b936d..4872bad5 100644 --- 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. # diff --git a/glance/store/base.py b/glance/store/base.py index 5df628c1..f0f89cbc 100644 --- a/glance/store/base.py +++ b/glance/store/base.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2012 RedHat Inc. # All Rights Reserved. diff --git a/glance/store/cinder.py b/glance/store/cinder.py index 9c29beae..a75d5b77 100644 --- a/glance/store/cinder.py +++ b/glance/store/cinder.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at diff --git a/glance/store/filesystem.py b/glance/store/filesystem.py index 8ecc851d..dd9d8bac 100644 --- a/glance/store/filesystem.py +++ b/glance/store/filesystem.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/store/gridfs.py b/glance/store/gridfs.py index ed92c7a5..14f0b5fa 100644 --- a/glance/store/gridfs.py +++ b/glance/store/gridfs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc # All Rights Reserved. # diff --git a/glance/store/http.py b/glance/store/http.py index 055c4747..4df03adf 100644 --- a/glance/store/http.py +++ b/glance/store/http.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/store/location.py b/glance/store/location.py index c010e1ef..6fe965a1 100644 --- a/glance/store/location.py +++ b/glance/store/location.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/store/rbd.py b/glance/store/rbd.py index 79871eb2..703c1aa7 100644 --- a/glance/store/rbd.py +++ b/glance/store/rbd.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 Josh Durgin # All Rights Reserved. # diff --git a/glance/store/s3.py b/glance/store/s3.py index 1f7759df..59ee0306 100644 --- a/glance/store/s3.py +++ b/glance/store/s3.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/store/scrubber.py b/glance/store/scrubber.py index 91e5a709..547a07a0 100644 --- a/glance/store/scrubber.py +++ b/glance/store/scrubber.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/store/sheepdog.py b/glance/store/sheepdog.py index 767715c5..11293f0e 100644 --- a/glance/store/sheepdog.py +++ b/glance/store/sheepdog.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Taobao Inc. # All Rights Reserved. # diff --git a/glance/store/swift.py b/glance/store/swift.py index 0a4041ce..ec67f83a 100644 --- a/glance/store/swift.py +++ b/glance/store/swift.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/__init__.py b/glance/tests/__init__.py index 95ccc591..b39fef35 100644 --- a/glance/tests/__init__.py +++ b/glance/tests/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/__init__.py b/glance/tests/functional/__init__.py index 5dc4452e..40021298 100644 --- a/glance/tests/functional/__init__.py +++ b/glance/tests/functional/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/db/base.py b/glance/tests/functional/db/base.py index 9f4f0530..6ddf638a 100644 --- a/glance/tests/functional/db/base.py +++ b/glance/tests/functional/db/base.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2012 OpenStack Foundation # Copyright 2012 Justin Santa Barbara # Copyright 2013 IBM Corp. diff --git a/glance/tests/functional/store/__init__.py b/glance/tests/functional/store/__init__.py index 119aded2..ff89821b 100644 --- a/glance/tests/functional/store/__init__.py +++ b/glance/tests/functional/store/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/store/test_cinder.py b/glance/tests/functional/store/test_cinder.py index 8b81bbb2..8458b55b 100644 --- a/glance/tests/functional/store/test_cinder.py +++ b/glance/tests/functional/store/test_cinder.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/store/test_filesystem.py b/glance/tests/functional/store/test_filesystem.py index 504c7d6c..19a0a3f0 100644 --- a/glance/tests/functional/store/test_filesystem.py +++ b/glance/tests/functional/store/test_filesystem.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/store/test_gridfs.py b/glance/tests/functional/store/test_gridfs.py index 9e636fb1..94fc4dac 100644 --- a/glance/tests/functional/store/test_gridfs.py +++ b/glance/tests/functional/store/test_gridfs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc # All Rights Reserved. # diff --git a/glance/tests/functional/store/test_http.py b/glance/tests/functional/store/test_http.py index 2c0bda05..c447bc0d 100644 --- a/glance/tests/functional/store/test_http.py +++ b/glance/tests/functional/store/test_http.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/store/test_rbd.py b/glance/tests/functional/store/test_rbd.py index 0dc0d3e7..15188c0d 100644 --- a/glance/tests/functional/store/test_rbd.py +++ b/glance/tests/functional/store/test_rbd.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/store/test_s3.py b/glance/tests/functional/store/test_s3.py index e64bfb07..ae730425 100644 --- a/glance/tests/functional/store/test_s3.py +++ b/glance/tests/functional/store/test_s3.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/store/test_sheepdog.py b/glance/tests/functional/store/test_sheepdog.py index f5685064..87ff49c5 100644 --- a/glance/tests/functional/store/test_sheepdog.py +++ b/glance/tests/functional/store/test_sheepdog.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Taobao Inc. # All Rights Reserved. # diff --git a/glance/tests/functional/store/test_swift.py b/glance/tests/functional/store/test_swift.py index db7886ac..1f1b38e3 100644 --- a/glance/tests/functional/store/test_swift.py +++ b/glance/tests/functional/store/test_swift.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/store_utils.py b/glance/tests/functional/store_utils.py index 3fca5e79..c20fbaf0 100644 --- a/glance/tests/functional/store_utils.py +++ b/glance/tests/functional/store_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2012 Red Hat, Inc # All Rights Reserved. diff --git a/glance/tests/functional/test_bin_glance_cache_manage.py b/glance/tests/functional/test_bin_glance_cache_manage.py index b9ce52a9..f5459f59 100644 --- a/glance/tests/functional/test_bin_glance_cache_manage.py +++ b/glance/tests/functional/test_bin_glance_cache_manage.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/test_cache_middleware.py b/glance/tests/functional/test_cache_middleware.py index 8b4fcb5e..10737cc2 100644 --- a/glance/tests/functional/test_cache_middleware.py +++ b/glance/tests/functional/test_cache_middleware.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/test_client_exceptions.py b/glance/tests/functional/test_client_exceptions.py index 8cef59e9..0aefece2 100644 --- a/glance/tests/functional/test_client_exceptions.py +++ b/glance/tests/functional/test_client_exceptions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2012 Red Hat, Inc # All Rights Reserved. diff --git a/glance/tests/functional/test_client_redirects.py b/glance/tests/functional/test_client_redirects.py index 76536458..9a34637c 100644 --- a/glance/tests/functional/test_client_redirects.py +++ b/glance/tests/functional/test_client_redirects.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/test_glance_manage.py b/glance/tests/functional/test_glance_manage.py index 81ef6691..fdfaed04 100644 --- a/glance/tests/functional/test_glance_manage.py +++ b/glance/tests/functional/test_glance_manage.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Red Hat, Inc # All Rights Reserved. # diff --git a/glance/tests/functional/test_gzip_middleware.py b/glance/tests/functional/test_gzip_middleware.py index 59fff30e..459e4c95 100644 --- a/glance/tests/functional/test_gzip_middleware.py +++ b/glance/tests/functional/test_gzip_middleware.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc # All Rights Reserved. # diff --git a/glance/tests/functional/test_logging.py b/glance/tests/functional/test_logging.py index 248f837d..0e8fe7a9 100644 --- a/glance/tests/functional/test_logging.py +++ b/glance/tests/functional/test_logging.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/test_scrubber.py b/glance/tests/functional/test_scrubber.py index 056875cc..aa6fa371 100644 --- a/glance/tests/functional/test_scrubber.py +++ b/glance/tests/functional/test_scrubber.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011-2012 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/test_sqlite.py b/glance/tests/functional/test_sqlite.py index 423b0f4c..09718af1 100644 --- a/glance/tests/functional/test_sqlite.py +++ b/glance/tests/functional/test_sqlite.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Red Hat, Inc # All Rights Reserved. # diff --git a/glance/tests/functional/v1/test_api.py b/glance/tests/functional/v1/test_api.py index da1b2cb6..5f9c2d5b 100644 --- a/glance/tests/functional/v1/test_api.py +++ b/glance/tests/functional/v1/test_api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/v1/test_copy_to_file.py b/glance/tests/functional/v1/test_copy_to_file.py index f712bced..3b94cb69 100644 --- a/glance/tests/functional/v1/test_copy_to_file.py +++ b/glance/tests/functional/v1/test_copy_to_file.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2012 Red Hat, Inc # All Rights Reserved. diff --git a/glance/tests/functional/v1/test_misc.py b/glance/tests/functional/v1/test_misc.py index 9fb9fe05..5955975c 100644 --- a/glance/tests/functional/v1/test_misc.py +++ b/glance/tests/functional/v1/test_misc.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/v1/test_multiprocessing.py b/glance/tests/functional/v1/test_multiprocessing.py index 7f77022f..f6eeb15d 100644 --- a/glance/tests/functional/v1/test_multiprocessing.py +++ b/glance/tests/functional/v1/test_multiprocessing.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/v1/test_ssl.py b/glance/tests/functional/v1/test_ssl.py index d1244c7d..29fa920a 100644 --- a/glance/tests/functional/v1/test_ssl.py +++ b/glance/tests/functional/v1/test_ssl.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/v2/test_images.py b/glance/tests/functional/v2/test_images.py index 306756d0..6f24e2f2 100644 --- a/glance/tests/functional/v2/test_images.py +++ b/glance/tests/functional/v2/test_images.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/v2/test_schemas.py b/glance/tests/functional/v2/test_schemas.py index 634c378d..aefa8c52 100644 --- a/glance/tests/functional/v2/test_schemas.py +++ b/glance/tests/functional/v2/test_schemas.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/functional/v2/test_tasks.py b/glance/tests/functional/v2/test_tasks.py index 39a8123c..c53bf0de 100644 --- a/glance/tests/functional/v2/test_tasks.py +++ b/glance/tests/functional/v2/test_tasks.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # All Rights Reserved. # diff --git a/glance/tests/integration/v2/base.py b/glance/tests/integration/v2/base.py index 249da93b..0ac20538 100644 --- a/glance/tests/integration/v2/base.py +++ b/glance/tests/integration/v2/base.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Rackspace Hosting # All Rights Reserved. # diff --git a/glance/tests/integration/v2/test_tasks_api.py b/glance/tests/integration/v2/test_tasks_api.py index 0c40e86e..6dfefa9a 100644 --- a/glance/tests/integration/v2/test_tasks_api.py +++ b/glance/tests/integration/v2/test_tasks_api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Rackspace Hosting # All Rights Reserved. # diff --git a/glance/tests/stubs.py b/glance/tests/stubs.py index 3c99b7d6..2e93bc02 100644 --- a/glance/tests/stubs.py +++ b/glance/tests/stubs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/unit/api/middleware/test_cache_manage.py b/glance/tests/unit/api/middleware/test_cache_manage.py index 59146ef3..283ce640 100644 --- a/glance/tests/unit/api/middleware/test_cache_manage.py +++ b/glance/tests/unit/api/middleware/test_cache_manage.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at diff --git a/glance/tests/unit/api/test_property_protections.py b/glance/tests/unit/api/test_property_protections.py index 6922b0b7..be0d82f5 100644 --- a/glance/tests/unit/api/test_property_protections.py +++ b/glance/tests/unit/api/test_property_protections.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/unit/base.py b/glance/tests/unit/base.py index 7dc24acb..eb28d05d 100644 --- a/glance/tests/unit/base.py +++ b/glance/tests/unit/base.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation. # All Rights Reserved. # diff --git a/glance/tests/unit/common/test_config.py b/glance/tests/unit/common/test_config.py index 7be32054..213f37f3 100644 --- a/glance/tests/unit/common/test_config.py +++ b/glance/tests/unit/common/test_config.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/unit/common/test_exception.py b/glance/tests/unit/common/test_exception.py index f9b1eec1..2184394b 100644 --- a/glance/tests/unit/common/test_exception.py +++ b/glance/tests/unit/common/test_exception.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/unit/common/test_rpc.py b/glance/tests/unit/common/test_rpc.py index 81bd98d8..ded1e7f2 100644 --- a/glance/tests/unit/common/test_rpc.py +++ b/glance/tests/unit/common/test_rpc.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- coding: utf-8 -*- # Copyright 2013 Red Hat, Inc. diff --git a/glance/tests/unit/common/test_utils.py b/glance/tests/unit/common/test_utils.py index a4374e80..18ea5c96 100644 --- a/glance/tests/unit/common/test_utils.py +++ b/glance/tests/unit/common/test_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/unit/common/test_wsgi.py b/glance/tests/unit/common/test_wsgi.py index 8f1c34cb..829c7597 100644 --- a/glance/tests/unit/common/test_wsgi.py +++ b/glance/tests/unit/common/test_wsgi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/unit/test_auth.py b/glance/tests/unit/test_auth.py index 30e9e8d9..8f23e196 100644 --- a/glance/tests/unit/test_auth.py +++ b/glance/tests/unit/test_auth.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2013 IBM Corp. # All Rights Reserved. diff --git a/glance/tests/unit/test_cached_images.py b/glance/tests/unit/test_cached_images.py index e60d7017..c0360384 100644 --- a/glance/tests/unit/test_cached_images.py +++ b/glance/tests/unit/test_cached_images.py @@ -12,7 +12,6 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -# vim: tabstop=4 shiftwidth=4 softtabstop=4 import testtools import webob diff --git a/glance/tests/unit/test_cinder_store.py b/glance/tests/unit/test_cinder_store.py index 5b906253..1879aca6 100644 --- a/glance/tests/unit/test_cinder_store.py +++ b/glance/tests/unit/test_cinder_store.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/unit/test_context.py b/glance/tests/unit/test_context.py index 79150e47..6bc02dd0 100644 --- a/glance/tests/unit/test_context.py +++ b/glance/tests/unit/test_context.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/unit/test_filesystem_store.py b/glance/tests/unit/test_filesystem_store.py index f505bb8c..b65dbaa5 100644 --- a/glance/tests/unit/test_filesystem_store.py +++ b/glance/tests/unit/test_filesystem_store.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/unit/test_glance_replicator.py b/glance/tests/unit/test_glance_replicator.py index 2c589b5a..0429dc39 100644 --- a/glance/tests/unit/test_glance_replicator.py +++ b/glance/tests/unit/test_glance_replicator.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Michael Still and Canonical Inc # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/glance/tests/unit/test_http_store.py b/glance/tests/unit/test_http_store.py index 710a53d0..104e31ad 100644 --- a/glance/tests/unit/test_http_store.py +++ b/glance/tests/unit/test_http_store.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/unit/test_image_cache.py b/glance/tests/unit/test_image_cache.py index e3c930c4..36613e08 100644 --- a/glance/tests/unit/test_image_cache.py +++ b/glance/tests/unit/test_image_cache.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/unit/test_migrations.py b/glance/tests/unit/test_migrations.py index a9a557b2..ecc5af95 100644 --- a/glance/tests/unit/test_migrations.py +++ b/glance/tests/unit/test_migrations.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # Copyright 2013 IBM Corp. diff --git a/glance/tests/unit/test_misc.py b/glance/tests/unit/test_misc.py index a8ef7cc5..624ecc8a 100644 --- a/glance/tests/unit/test_misc.py +++ b/glance/tests/unit/test_misc.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/unit/test_notifier.py b/glance/tests/unit/test_notifier.py index 7ba05a94..3cfd5642 100644 --- a/glance/tests/unit/test_notifier.py +++ b/glance/tests/unit/test_notifier.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # Copyright 2013 IBM Corp. # All Rights Reserved. diff --git a/glance/tests/unit/test_s3_store.py b/glance/tests/unit/test_s3_store.py index a23e1848..172e36d3 100644 --- a/glance/tests/unit/test_s3_store.py +++ b/glance/tests/unit/test_s3_store.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/unit/test_scrubber.py b/glance/tests/unit/test_scrubber.py index 48604e46..29f9e4b7 100644 --- a/glance/tests/unit/test_scrubber.py +++ b/glance/tests/unit/test_scrubber.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # All Rights Reserved. # diff --git a/glance/tests/unit/test_store_base.py b/glance/tests/unit/test_store_base.py index 6609fdce..0803aaab 100644 --- a/glance/tests/unit/test_store_base.py +++ b/glance/tests/unit/test_store_base.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011-2013 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/unit/test_store_location.py b/glance/tests/unit/test_store_location.py index 37231756..6165fc85 100644 --- a/glance/tests/unit/test_store_location.py +++ b/glance/tests/unit/test_store_location.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011-2013 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/unit/test_swift_store.py b/glance/tests/unit/test_swift_store.py index b09f0306..0ca2d08a 100644 --- a/glance/tests/unit/test_swift_store.py +++ b/glance/tests/unit/test_swift_store.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/unit/test_versions.py b/glance/tests/unit/test_versions.py index 559c8bf3..e258790c 100644 --- a/glance/tests/unit/test_versions.py +++ b/glance/tests/unit/test_versions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation. # All Rights Reserved. # diff --git a/glance/tests/unit/v1/test_api.py b/glance/tests/unit/v1/test_api.py index 55e96c0b..9ab26ceb 100644 --- a/glance/tests/unit/v1/test_api.py +++ b/glance/tests/unit/v1/test_api.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- coding: utf-8 -*- # Copyright 2010-2011 OpenStack Foundation diff --git a/glance/tests/unit/v1/test_registry_api.py b/glance/tests/unit/v1/test_registry_api.py index 64cf17ea..e70c5f75 100644 --- a/glance/tests/unit/v1/test_registry_api.py +++ b/glance/tests/unit/v1/test_registry_api.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- coding: utf-8 -*- # Copyright 2010-2011 OpenStack Foundation diff --git a/glance/tests/unit/v1/test_registry_client.py b/glance/tests/unit/v1/test_registry_client.py index d7c3fb84..b284df81 100644 --- a/glance/tests/unit/v1/test_registry_client.py +++ b/glance/tests/unit/v1/test_registry_client.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/unit/v1/test_upload_utils.py b/glance/tests/unit/v1/test_upload_utils.py index 0f78f289..6d4050a1 100644 --- a/glance/tests/unit/v1/test_upload_utils.py +++ b/glance/tests/unit/v1/test_upload_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/tests/unit/v2/test_registry_api.py b/glance/tests/unit/v2/test_registry_api.py index a3f67034..cc52d6f7 100644 --- a/glance/tests/unit/v2/test_registry_api.py +++ b/glance/tests/unit/v2/test_registry_api.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- coding: utf-8 -*- # Copyright 2013 Red Hat, Inc. diff --git a/glance/tests/unit/v2/test_registry_client.py b/glance/tests/unit/v2/test_registry_client.py index 03b4ec78..d6777982 100644 --- a/glance/tests/unit/v2/test_registry_client.py +++ b/glance/tests/unit/v2/test_registry_client.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # All Rights Reserved. # diff --git a/glance/tests/utils.py b/glance/tests/utils.py index c926c08a..96d95df8 100644 --- a/glance/tests/utils.py +++ b/glance/tests/utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # All Rights Reserved. # diff --git a/glance/version.py b/glance/version.py index d8151836..0172206c 100644 --- a/glance/version.py +++ b/glance/version.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 46309af8..548ece22 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.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.