diff --git a/bin/keystone-all b/bin/keystone-all index f9091e2b57..50042b3377 100755 --- a/bin/keystone-all +++ b/bin/keystone-all @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2013 OpenStack Foundation # diff --git a/bin/keystone-manage b/bin/keystone-manage index 9df13578b6..e11e706e1d 100755 --- a/bin/keystone-manage +++ b/bin/keystone-manage @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2013 OpenStack Foundation # diff --git a/doc/ext/apidoc.py b/doc/ext/apidoc.py index 20f208f694..435d388f1f 100644 --- a/doc/ext/apidoc.py +++ b/doc/ext/apidoc.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/httpd/keystone.py b/httpd/keystone.py index b216a59d45..f6cb8cc454 100644 --- a/httpd/keystone.py +++ b/httpd/keystone.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/assignment/__init__.py b/keystone/assignment/__init__.py index 3c76d96606..0a3e4e9973 100644 --- a/keystone/assignment/__init__.py +++ b/keystone/assignment/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # flake8: noqa # Copyright 2013 OpenStack Foundation diff --git a/keystone/assignment/backends/kvs.py b/keystone/assignment/backends/kvs.py index 8a2ab82999..04a807a407 100644 --- a/keystone/assignment/backends/kvs.py +++ b/keystone/assignment/backends/kvs.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/keystone/assignment/backends/ldap.py b/keystone/assignment/backends/ldap.py index e3023886e0..13386c8720 100644 --- a/keystone/assignment/backends/ldap.py +++ b/keystone/assignment/backends/ldap.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012-2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/assignment/backends/sql.py b/keystone/assignment/backends/sql.py index 376ff55de3..c719a1f8e0 100644 --- a/keystone/assignment/backends/sql.py +++ b/keystone/assignment/backends/sql.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012-13 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/assignment/core.py b/keystone/assignment/core.py index 3849003ab1..7316b530f3 100644 --- a/keystone/assignment/core.py +++ b/keystone/assignment/core.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/keystone/auth/__init__.py b/keystone/auth/__init__.py index 27e2c4f87d..d5d3b90c15 100644 --- a/keystone/auth/__init__.py +++ b/keystone/auth/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # flake8: noqa # Copyright 2013 OpenStack Foundation diff --git a/keystone/auth/controllers.py b/keystone/auth/controllers.py index acfabcd945..bd83701356 100644 --- a/keystone/auth/controllers.py +++ b/keystone/auth/controllers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/auth/core.py b/keystone/auth/core.py index b1c54cd10a..3d6183acdf 100644 --- a/keystone/auth/core.py +++ b/keystone/auth/core.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/auth/plugins/external.py b/keystone/auth/plugins/external.py index 452ca25851..09777693d6 100644 --- a/keystone/auth/plugins/external.py +++ b/keystone/auth/plugins/external.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/auth/plugins/oauth1.py b/keystone/auth/plugins/oauth1.py index c5c9785d7c..ba1601b08c 100644 --- a/keystone/auth/plugins/oauth1.py +++ b/keystone/auth/plugins/oauth1.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/auth/plugins/password.py b/keystone/auth/plugins/password.py index 45397292e9..2b15e15503 100644 --- a/keystone/auth/plugins/password.py +++ b/keystone/auth/plugins/password.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/auth/plugins/token.py b/keystone/auth/plugins/token.py index 615c708b07..6c39b6c7b7 100644 --- a/keystone/auth/plugins/token.py +++ b/keystone/auth/plugins/token.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/auth/routers.py b/keystone/auth/routers.py index ba29b2f520..c15e5476f5 100644 --- a/keystone/auth/routers.py +++ b/keystone/auth/routers.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/keystone/catalog/__init__.py b/keystone/catalog/__init__.py index 35fb00f69c..9cef97fa36 100644 --- a/keystone/catalog/__init__.py +++ b/keystone/catalog/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # flake8: noqa # Copyright 2012 OpenStack Foundation diff --git a/keystone/catalog/backends/kvs.py b/keystone/catalog/backends/kvs.py index bb9c758f40..2129be03af 100644 --- a/keystone/catalog/backends/kvs.py +++ b/keystone/catalog/backends/kvs.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/keystone/catalog/backends/sql.py b/keystone/catalog/backends/sql.py index 60934654b5..8a7c75ee86 100644 --- a/keystone/catalog/backends/sql.py +++ b/keystone/catalog/backends/sql.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2012 OpenStack Foundation # Copyright 2012 Canonical Ltd. # diff --git a/keystone/catalog/backends/templated.py b/keystone/catalog/backends/templated.py index 0c583e8e88..1ca80cb351 100644 --- a/keystone/catalog/backends/templated.py +++ b/keystone/catalog/backends/templated.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundationc # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/catalog/controllers.py b/keystone/catalog/controllers.py index 2ab95d2b0c..1d1cb788d0 100644 --- a/keystone/catalog/controllers.py +++ b/keystone/catalog/controllers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # Copyright 2012 Canonical Ltd. # diff --git a/keystone/catalog/core.py b/keystone/catalog/core.py index 02785a732d..172b354d3c 100644 --- a/keystone/catalog/core.py +++ b/keystone/catalog/core.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # Copyright 2012 Canonical Ltd. # diff --git a/keystone/catalog/routers.py b/keystone/catalog/routers.py index 80740aa758..acf1475ac4 100644 --- a/keystone/catalog/routers.py +++ b/keystone/catalog/routers.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/keystone/clean.py b/keystone/clean.py index eef20d4c9e..208eebee1c 100644 --- a/keystone/clean.py +++ b/keystone/clean.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/keystone/cli.py b/keystone/cli.py index 8e41f2264d..eaf2192328 100644 --- a/keystone/cli.py +++ b/keystone/cli.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/keystone/common/authorization.py b/keystone/common/authorization.py index 74957e4fde..3d97b540be 100644 --- a/keystone/common/authorization.py +++ b/keystone/common/authorization.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/keystone/common/base64utils.py b/keystone/common/base64utils.py index 9ad3b5dd1a..b944401b1d 100644 --- a/keystone/common/base64utils.py +++ b/keystone/common/base64utils.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/keystone/common/cache/__init__.py b/keystone/common/cache/__init__.py index c556c80b87..ec7de293ec 100644 --- a/keystone/common/cache/__init__.py +++ b/keystone/common/cache/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Metacloud # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/cache/backends/__init__.py b/keystone/common/cache/backends/__init__.py index 42ad33836e..fea79e6675 100644 --- a/keystone/common/cache/backends/__init__.py +++ b/keystone/common/cache/backends/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Metacloud # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/cache/backends/noop.py b/keystone/common/cache/backends/noop.py index 646610a3aa..38329c9401 100644 --- a/keystone/common/cache/backends/noop.py +++ b/keystone/common/cache/backends/noop.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Metacloud # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/cache/core.py b/keystone/common/cache/core.py index a8f3ba0e61..0ced079de8 100644 --- a/keystone/common/cache/core.py +++ b/keystone/common/cache/core.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Metacloud # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/cms.py b/keystone/common/cms.py index e3c835ceec..917de3d864 100644 --- a/keystone/common/cms.py +++ b/keystone/common/cms.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/config.py b/keystone/common/config.py index ddff184117..40d42a5efa 100644 --- a/keystone/common/config.py +++ b/keystone/common/config.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/keystone/common/controller.py b/keystone/common/controller.py index 6347e39cf0..11eaa0c7cb 100644 --- a/keystone/common/controller.py +++ b/keystone/common/controller.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/dependency.py b/keystone/common/dependency.py index 9a93ee1a16..e03205415b 100644 --- a/keystone/common/dependency.py +++ b/keystone/common/dependency.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/keystone/common/driver_hints.py b/keystone/common/driver_hints.py index 9717649301..280f1e4dc2 100644 --- a/keystone/common/driver_hints.py +++ b/keystone/common/driver_hints.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # Copyright 2013 IBM Corp. # diff --git a/keystone/common/environment/__init__.py b/keystone/common/environment/__init__.py index fcd343b4eb..4554ddb2e7 100644 --- a/keystone/common/environment/__init__.py +++ b/keystone/common/environment/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/environment/eventlet_server.py b/keystone/common/environment/eventlet_server.py index be9eba09f9..062a798b27 100644 --- a/keystone/common/environment/eventlet_server.py +++ b/keystone/common/environment/eventlet_server.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/keystone/common/extension.py b/keystone/common/extension.py index 37e7d6155d..b2ea80bc33 100644 --- a/keystone/common/extension.py +++ b/keystone/common/extension.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/kvs/legacy.py b/keystone/common/kvs/legacy.py index 3bc8392919..439ff5e14a 100644 --- a/keystone/common/kvs/legacy.py +++ b/keystone/common/kvs/legacy.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/keystone/common/ldap/__init__.py b/keystone/common/ldap/__init__.py index 24069356c9..5cfd58385a 100644 --- a/keystone/common/ldap/__init__.py +++ b/keystone/common/ldap/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # flake8: noqa # Copyright 2012 OpenStack Foundation diff --git a/keystone/common/ldap/core.py b/keystone/common/ldap/core.py index 36e6024040..84ea65f5b4 100644 --- a/keystone/common/ldap/core.py +++ b/keystone/common/ldap/core.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/keystone/common/manager.py b/keystone/common/manager.py index 693a7bb34a..c87f6093ef 100644 --- a/keystone/common/manager.py +++ b/keystone/common/manager.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/keystone/common/models.py b/keystone/common/models.py index b76bcac1cd..e0ec4683f6 100644 --- a/keystone/common/models.py +++ b/keystone/common/models.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/keystone/common/openssl.py b/keystone/common/openssl.py index 7d1264fef9..96c6d3e2ef 100644 --- a/keystone/common/openssl.py +++ b/keystone/common/openssl.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/keystone/common/pemutils.py b/keystone/common/pemutils.py index 1b25962abb..798366ba81 100755 --- a/keystone/common/pemutils.py +++ b/keystone/common/pemutils.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/keystone/common/router.py b/keystone/common/router.py index d35d3ca320..48a377c123 100644 --- a/keystone/common/router.py +++ b/keystone/common/router.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/keystone/common/serializer.py b/keystone/common/serializer.py index 52179681ba..dd33751278 100644 --- a/keystone/common/serializer.py +++ b/keystone/common/serializer.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/keystone/common/sql/__init__.py b/keystone/common/sql/__init__.py index ee65b12d89..863d826fee 100644 --- a/keystone/common/sql/__init__.py +++ b/keystone/common/sql/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # flake8: noqa # Copyright 2012 OpenStack Foundation diff --git a/keystone/common/sql/core.py b/keystone/common/sql/core.py index 4053ee2216..01a29c2618 100644 --- a/keystone/common/sql/core.py +++ b/keystone/common/sql/core.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/keystone/common/sql/migrate_repo/versions/001_add_initial_tables.py b/keystone/common/sql/migrate_repo/versions/001_add_initial_tables.py index 64fff312c2..db8779ff5f 100644 --- a/keystone/common/sql/migrate_repo/versions/001_add_initial_tables.py +++ b/keystone/common/sql/migrate_repo/versions/001_add_initial_tables.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/keystone/common/sql/migrate_repo/versions/002_token_id_hash.py b/keystone/common/sql/migrate_repo/versions/002_token_id_hash.py index 4d38b525d8..d2b6d47300 100644 --- a/keystone/common/sql/migrate_repo/versions/002_token_id_hash.py +++ b/keystone/common/sql/migrate_repo/versions/002_token_id_hash.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/003_token_valid.py b/keystone/common/sql/migrate_repo/versions/003_token_valid.py index c8df800cc0..5fefc05150 100644 --- a/keystone/common/sql/migrate_repo/versions/003_token_valid.py +++ b/keystone/common/sql/migrate_repo/versions/003_token_valid.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack LLC # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/004_undo_token_id_hash.py b/keystone/common/sql/migrate_repo/versions/004_undo_token_id_hash.py index 8cfad79f4e..cfe1fce814 100644 --- a/keystone/common/sql/migrate_repo/versions/004_undo_token_id_hash.py +++ b/keystone/common/sql/migrate_repo/versions/004_undo_token_id_hash.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/005_set_utf8_character_set.py b/keystone/common/sql/migrate_repo/versions/005_set_utf8_character_set.py index 1f1ff2af29..72cac71f36 100644 --- a/keystone/common/sql/migrate_repo/versions/005_set_utf8_character_set.py +++ b/keystone/common/sql/migrate_repo/versions/005_set_utf8_character_set.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/keystone/common/sql/migrate_repo/versions/006_add_policy_table.py b/keystone/common/sql/migrate_repo/versions/006_add_policy_table.py index 0be005b0bd..62f87d427b 100644 --- a/keystone/common/sql/migrate_repo/versions/006_add_policy_table.py +++ b/keystone/common/sql/migrate_repo/versions/006_add_policy_table.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/keystone/common/sql/migrate_repo/versions/007_add_domain_tables.py b/keystone/common/sql/migrate_repo/versions/007_add_domain_tables.py index 6fda6ec8c7..adf350b4c6 100644 --- a/keystone/common/sql/migrate_repo/versions/007_add_domain_tables.py +++ b/keystone/common/sql/migrate_repo/versions/007_add_domain_tables.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/keystone/common/sql/migrate_repo/versions/008_create_default_domain.py b/keystone/common/sql/migrate_repo/versions/008_create_default_domain.py index f28d2ee38a..09e16cbf5e 100644 --- a/keystone/common/sql/migrate_repo/versions/008_create_default_domain.py +++ b/keystone/common/sql/migrate_repo/versions/008_create_default_domain.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/keystone/common/sql/migrate_repo/versions/009_normalize_identity.py b/keystone/common/sql/migrate_repo/versions/009_normalize_identity.py index dec7bbb473..b41b5172a8 100644 --- a/keystone/common/sql/migrate_repo/versions/009_normalize_identity.py +++ b/keystone/common/sql/migrate_repo/versions/009_normalize_identity.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/keystone/common/sql/migrate_repo/versions/010_normalize_identity_migration.py b/keystone/common/sql/migrate_repo/versions/010_normalize_identity_migration.py index 9c7485b0c7..41b609ad72 100644 --- a/keystone/common/sql/migrate_repo/versions/010_normalize_identity_migration.py +++ b/keystone/common/sql/migrate_repo/versions/010_normalize_identity_migration.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/keystone/common/sql/migrate_repo/versions/011_endpoints_v3.py b/keystone/common/sql/migrate_repo/versions/011_endpoints_v3.py index 08eb5821e6..d9dc00acb1 100644 --- a/keystone/common/sql/migrate_repo/versions/011_endpoints_v3.py +++ b/keystone/common/sql/migrate_repo/versions/011_endpoints_v3.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/keystone/common/sql/migrate_repo/versions/012_populate_endpoint_type.py b/keystone/common/sql/migrate_repo/versions/012_populate_endpoint_type.py index e1e380cde3..1759e16c14 100644 --- a/keystone/common/sql/migrate_repo/versions/012_populate_endpoint_type.py +++ b/keystone/common/sql/migrate_repo/versions/012_populate_endpoint_type.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/keystone/common/sql/migrate_repo/versions/013_drop_legacy_endpoints.py b/keystone/common/sql/migrate_repo/versions/013_drop_legacy_endpoints.py index 93c731a3a3..ca83faa29c 100644 --- a/keystone/common/sql/migrate_repo/versions/013_drop_legacy_endpoints.py +++ b/keystone/common/sql/migrate_repo/versions/013_drop_legacy_endpoints.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/keystone/common/sql/migrate_repo/versions/014_add_group_tables.py b/keystone/common/sql/migrate_repo/versions/014_add_group_tables.py index 0e15874a5c..5fdf3d4441 100644 --- a/keystone/common/sql/migrate_repo/versions/014_add_group_tables.py +++ b/keystone/common/sql/migrate_repo/versions/014_add_group_tables.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/keystone/common/sql/migrate_repo/versions/015_tenant_to_project.py b/keystone/common/sql/migrate_repo/versions/015_tenant_to_project.py index 66108311c3..7338aaee7f 100644 --- a/keystone/common/sql/migrate_repo/versions/015_tenant_to_project.py +++ b/keystone/common/sql/migrate_repo/versions/015_tenant_to_project.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py b/keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py index 5c0586e623..22bdc7078a 100644 --- a/keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py +++ b/keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # Copyright 2013 IBM Corp. # diff --git a/keystone/common/sql/migrate_repo/versions/017_membership_role.py b/keystone/common/sql/migrate_repo/versions/017_membership_role.py index 2c1771f9b3..64c9c4740a 100644 --- a/keystone/common/sql/migrate_repo/versions/017_membership_role.py +++ b/keystone/common/sql/migrate_repo/versions/017_membership_role.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/018_add_trust_tables.py b/keystone/common/sql/migrate_repo/versions/018_add_trust_tables.py index 99f165eae3..cec39a74c3 100644 --- a/keystone/common/sql/migrate_repo/versions/018_add_trust_tables.py +++ b/keystone/common/sql/migrate_repo/versions/018_add_trust_tables.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/keystone/common/sql/migrate_repo/versions/019_fixup_role.py b/keystone/common/sql/migrate_repo/versions/019_fixup_role.py index a9454e4ee6..bbd0cae5db 100644 --- a/keystone/common/sql/migrate_repo/versions/019_fixup_role.py +++ b/keystone/common/sql/migrate_repo/versions/019_fixup_role.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py b/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py index cfde23738e..05237c0d9b 100644 --- a/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py +++ b/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/021_add_trust_to_token.py b/keystone/common/sql/migrate_repo/versions/021_add_trust_to_token.py index 1de51e1b8f..b5dd3eacce 100644 --- a/keystone/common/sql/migrate_repo/versions/021_add_trust_to_token.py +++ b/keystone/common/sql/migrate_repo/versions/021_add_trust_to_token.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/022_move_legacy_endpoint_id.py b/keystone/common/sql/migrate_repo/versions/022_move_legacy_endpoint_id.py index 70570002b7..58737f5795 100644 --- a/keystone/common/sql/migrate_repo/versions/022_move_legacy_endpoint_id.py +++ b/keystone/common/sql/migrate_repo/versions/022_move_legacy_endpoint_id.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/023_drop_credential_constraints.py b/keystone/common/sql/migrate_repo/versions/023_drop_credential_constraints.py index 99967e6a98..6893842692 100644 --- a/keystone/common/sql/migrate_repo/versions/023_drop_credential_constraints.py +++ b/keystone/common/sql/migrate_repo/versions/023_drop_credential_constraints.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/024_add_index_to_expires.py b/keystone/common/sql/migrate_repo/versions/024_add_index_to_expires.py index ffb827e6ec..24f98043d0 100644 --- a/keystone/common/sql/migrate_repo/versions/024_add_index_to_expires.py +++ b/keystone/common/sql/migrate_repo/versions/024_add_index_to_expires.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/025_add_index_to_valid.py b/keystone/common/sql/migrate_repo/versions/025_add_index_to_valid.py index 3bb547c9b0..62bee18aad 100644 --- a/keystone/common/sql/migrate_repo/versions/025_add_index_to_valid.py +++ b/keystone/common/sql/migrate_repo/versions/025_add_index_to_valid.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/026_drop_user_group_constraints.py b/keystone/common/sql/migrate_repo/versions/026_drop_user_group_constraints.py index 266085c4a6..f6f236216e 100644 --- a/keystone/common/sql/migrate_repo/versions/026_drop_user_group_constraints.py +++ b/keystone/common/sql/migrate_repo/versions/026_drop_user_group_constraints.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/027_set_engine_mysql_innodb.py b/keystone/common/sql/migrate_repo/versions/027_set_engine_mysql_innodb.py index c5e954f807..48d77f5262 100644 --- a/keystone/common/sql/migrate_repo/versions/027_set_engine_mysql_innodb.py +++ b/keystone/common/sql/migrate_repo/versions/027_set_engine_mysql_innodb.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/028_fixup_group_metadata.py b/keystone/common/sql/migrate_repo/versions/028_fixup_group_metadata.py index d1ca484ca8..61fce39eb3 100644 --- a/keystone/common/sql/migrate_repo/versions/028_fixup_group_metadata.py +++ b/keystone/common/sql/migrate_repo/versions/028_fixup_group_metadata.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/029_update_assignment_metadata.py b/keystone/common/sql/migrate_repo/versions/029_update_assignment_metadata.py index 82e992b730..a02f9d8a1a 100644 --- a/keystone/common/sql/migrate_repo/versions/029_update_assignment_metadata.py +++ b/keystone/common/sql/migrate_repo/versions/029_update_assignment_metadata.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/030_drop_credential_constraint_sqlite.py b/keystone/common/sql/migrate_repo/versions/030_drop_credential_constraint_sqlite.py index 5d6e3d26dd..aff1713fa3 100644 --- a/keystone/common/sql/migrate_repo/versions/030_drop_credential_constraint_sqlite.py +++ b/keystone/common/sql/migrate_repo/versions/030_drop_credential_constraint_sqlite.py @@ -1,6 +1,3 @@ - -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/031_drop_credential_indexes.py b/keystone/common/sql/migrate_repo/versions/031_drop_credential_indexes.py index 89ca04f02f..37943aff0e 100644 --- a/keystone/common/sql/migrate_repo/versions/031_drop_credential_indexes.py +++ b/keystone/common/sql/migrate_repo/versions/031_drop_credential_indexes.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/032_username_length.py b/keystone/common/sql/migrate_repo/versions/032_username_length.py index 052b62ca2e..26530eb6ba 100644 --- a/keystone/common/sql/migrate_repo/versions/032_username_length.py +++ b/keystone/common/sql/migrate_repo/versions/032_username_length.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/033_migrate_ec2credentials_table_credentials.py b/keystone/common/sql/migrate_repo/versions/033_migrate_ec2credentials_table_credentials.py index e389e9bb3e..080c84ce3b 100644 --- a/keystone/common/sql/migrate_repo/versions/033_migrate_ec2credentials_table_credentials.py +++ b/keystone/common/sql/migrate_repo/versions/033_migrate_ec2credentials_table_credentials.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/034_add_default_project_id_column_to_user.py b/keystone/common/sql/migrate_repo/versions/034_add_default_project_id_column_to_user.py index def59d286e..17ad21713a 100644 --- a/keystone/common/sql/migrate_repo/versions/034_add_default_project_id_column_to_user.py +++ b/keystone/common/sql/migrate_repo/versions/034_add_default_project_id_column_to_user.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/035_add_compound_revoked_token_index.py b/keystone/common/sql/migrate_repo/versions/035_add_compound_revoked_token_index.py index bcce9d4b32..1716819195 100644 --- a/keystone/common/sql/migrate_repo/versions/035_add_compound_revoked_token_index.py +++ b/keystone/common/sql/migrate_repo/versions/035_add_compound_revoked_token_index.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/036_token_drop_valid_index.py b/keystone/common/sql/migrate_repo/versions/036_token_drop_valid_index.py index 6bf3c5e930..89e03b7503 100644 --- a/keystone/common/sql/migrate_repo/versions/036_token_drop_valid_index.py +++ b/keystone/common/sql/migrate_repo/versions/036_token_drop_valid_index.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migrate_repo/versions/037_add_region_table.py b/keystone/common/sql/migrate_repo/versions/037_add_region_table.py index e1f2e659f7..08413e2d96 100644 --- a/keystone/common/sql/migrate_repo/versions/037_add_region_table.py +++ b/keystone/common/sql/migrate_repo/versions/037_add_region_table.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/common/sql/migration.py b/keystone/common/sql/migration.py index c96fdf0621..ebe87c4f11 100644 --- a/keystone/common/sql/migration.py +++ b/keystone/common/sql/migration.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/keystone/common/sql/migration_helpers.py b/keystone/common/sql/migration_helpers.py index 48fa188ce4..3f076361ca 100644 --- a/keystone/common/sql/migration_helpers.py +++ b/keystone/common/sql/migration_helpers.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/keystone/common/systemd.py b/keystone/common/systemd.py index 52d7aff906..807b24184d 100644 --- a/keystone/common/systemd.py +++ b/keystone/common/systemd.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/keystone/common/utils.py b/keystone/common/utils.py index 826e479922..a36e45303f 100644 --- a/keystone/common/utils.py +++ b/keystone/common/utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py index 8ebf7aca11..b13b476c52 100644 --- a/keystone/common/wsgi.py +++ b/keystone/common/wsgi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/keystone/config.py b/keystone/config.py index 367c8edddc..9df0f392e9 100644 --- a/keystone/config.py +++ b/keystone/config.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/keystone/contrib/access/__init__.py b/keystone/contrib/access/__init__.py index 28e6c65102..afc7d422dc 100644 --- a/keystone/contrib/access/__init__.py +++ b/keystone/contrib/access/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # flake8: noqa # Copyright 2013 OpenStack Foundation diff --git a/keystone/contrib/access/core.py b/keystone/contrib/access/core.py index b0c6f7c0ae..ff06bd504f 100644 --- a/keystone/contrib/access/core.py +++ b/keystone/contrib/access/core.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/admin_crud/__init__.py b/keystone/contrib/admin_crud/__init__.py index 9511edc991..8b6af0e100 100644 --- a/keystone/contrib/admin_crud/__init__.py +++ b/keystone/contrib/admin_crud/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # flake8: noqa # Copyright 2012 OpenStack Foundation diff --git a/keystone/contrib/admin_crud/core.py b/keystone/contrib/admin_crud/core.py index d5bc765280..342da54879 100644 --- a/keystone/contrib/admin_crud/core.py +++ b/keystone/contrib/admin_crud/core.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/keystone/contrib/ec2/__init__.py b/keystone/contrib/ec2/__init__.py index 18492c6736..e7026fbb5a 100644 --- a/keystone/contrib/ec2/__init__.py +++ b/keystone/contrib/ec2/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # flake8: noqa # Copyright 2012 OpenStack Foundation diff --git a/keystone/contrib/ec2/controllers.py b/keystone/contrib/ec2/controllers.py index fa2ec73c23..b46a72cb65 100644 --- a/keystone/contrib/ec2/controllers.py +++ b/keystone/contrib/ec2/controllers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/ec2/core.py b/keystone/contrib/ec2/core.py index dffc8e2b3d..9f1f85f02f 100644 --- a/keystone/contrib/ec2/core.py +++ b/keystone/contrib/ec2/core.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/keystone/contrib/ec2/routers.py b/keystone/contrib/ec2/routers.py index 562bda5899..e4f8e95524 100644 --- a/keystone/contrib/ec2/routers.py +++ b/keystone/contrib/ec2/routers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/endpoint_filter/__init__.py b/keystone/contrib/endpoint_filter/__init__.py index ce74bfdf33..43f4fb60b9 100644 --- a/keystone/contrib/endpoint_filter/__init__.py +++ b/keystone/contrib/endpoint_filter/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # flake8: noqa # Copyright 2013 OpenStack Foundation diff --git a/keystone/contrib/endpoint_filter/backends/catalog_sql.py b/keystone/contrib/endpoint_filter/backends/catalog_sql.py index 698f03efc3..1f789a8c52 100644 --- a/keystone/contrib/endpoint_filter/backends/catalog_sql.py +++ b/keystone/contrib/endpoint_filter/backends/catalog_sql.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/endpoint_filter/backends/sql.py b/keystone/contrib/endpoint_filter/backends/sql.py index d0d02f1c9f..2fc534240d 100644 --- a/keystone/contrib/endpoint_filter/backends/sql.py +++ b/keystone/contrib/endpoint_filter/backends/sql.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/endpoint_filter/controllers.py b/keystone/contrib/endpoint_filter/controllers.py index 474b1f9e4f..3168b99255 100644 --- a/keystone/contrib/endpoint_filter/controllers.py +++ b/keystone/contrib/endpoint_filter/controllers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/endpoint_filter/core.py b/keystone/contrib/endpoint_filter/core.py index b94225ffd0..cf07ca40b6 100644 --- a/keystone/contrib/endpoint_filter/core.py +++ b/keystone/contrib/endpoint_filter/core.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/endpoint_filter/migrate_repo/versions/001_add_endpoint_filtering_table.py b/keystone/contrib/endpoint_filter/migrate_repo/versions/001_add_endpoint_filtering_table.py index d3bf075161..090e7f4719 100644 --- a/keystone/contrib/endpoint_filter/migrate_repo/versions/001_add_endpoint_filtering_table.py +++ b/keystone/contrib/endpoint_filter/migrate_repo/versions/001_add_endpoint_filtering_table.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/endpoint_filter/routers.py b/keystone/contrib/endpoint_filter/routers.py index 8f7d48227e..91f09bd059 100644 --- a/keystone/contrib/endpoint_filter/routers.py +++ b/keystone/contrib/endpoint_filter/routers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/example/controllers.py b/keystone/contrib/example/controllers.py index 204f88429e..95b3e82f4a 100644 --- a/keystone/contrib/example/controllers.py +++ b/keystone/contrib/example/controllers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/example/core.py b/keystone/contrib/example/core.py index f66af2ba23..86d1e26448 100644 --- a/keystone/contrib/example/core.py +++ b/keystone/contrib/example/core.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/example/migrate_repo/versions/001_example_table.py b/keystone/contrib/example/migrate_repo/versions/001_example_table.py index 7f7de147a5..10b7ccc7e5 100644 --- a/keystone/contrib/example/migrate_repo/versions/001_example_table.py +++ b/keystone/contrib/example/migrate_repo/versions/001_example_table.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/keystone/contrib/example/routers.py b/keystone/contrib/example/routers.py index d7f502bc2a..23ba4c2ca0 100644 --- a/keystone/contrib/example/routers.py +++ b/keystone/contrib/example/routers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/federation/__init__.py b/keystone/contrib/federation/__init__.py index c12c04467f..35bf9f3124 100644 --- a/keystone/contrib/federation/__init__.py +++ b/keystone/contrib/federation/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2014 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/federation/backends/sql.py b/keystone/contrib/federation/backends/sql.py index f77da2d9a2..6bc7d10ce2 100644 --- a/keystone/contrib/federation/backends/sql.py +++ b/keystone/contrib/federation/backends/sql.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2014 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/federation/controllers.py b/keystone/contrib/federation/controllers.py index 83c6758274..554618ed48 100644 --- a/keystone/contrib/federation/controllers.py +++ b/keystone/contrib/federation/controllers.py @@ -1,6 +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/keystone/contrib/federation/core.py b/keystone/contrib/federation/core.py index 62bd9a76ac..4c8df4e618 100644 --- a/keystone/contrib/federation/core.py +++ b/keystone/contrib/federation/core.py @@ -1,6 +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/keystone/contrib/federation/migrate_repo/versions/001_add_identity_provider_table.py b/keystone/contrib/federation/migrate_repo/versions/001_add_identity_provider_table.py index 4eac8bb882..1a522c2068 100644 --- a/keystone/contrib/federation/migrate_repo/versions/001_add_identity_provider_table.py +++ b/keystone/contrib/federation/migrate_repo/versions/001_add_identity_provider_table.py @@ -1,6 +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/keystone/contrib/federation/migrate_repo/versions/002_add_mapping_tables.py b/keystone/contrib/federation/migrate_repo/versions/002_add_mapping_tables.py index 4e990a6201..17bb8ded5a 100644 --- a/keystone/contrib/federation/migrate_repo/versions/002_add_mapping_tables.py +++ b/keystone/contrib/federation/migrate_repo/versions/002_add_mapping_tables.py @@ -1,6 +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/keystone/contrib/federation/routers.py b/keystone/contrib/federation/routers.py index 39331627a3..c387357078 100644 --- a/keystone/contrib/federation/routers.py +++ b/keystone/contrib/federation/routers.py @@ -1,6 +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/keystone/contrib/federation/utils.py b/keystone/contrib/federation/utils.py index f134da2852..48a87bbad1 100644 --- a/keystone/contrib/federation/utils.py +++ b/keystone/contrib/federation/utils.py @@ -1,6 +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/keystone/contrib/kds/api/__init__.py b/keystone/contrib/kds/api/__init__.py index 8c6d5f866c..0680747644 100644 --- a/keystone/contrib/kds/api/__init__.py +++ b/keystone/contrib/kds/api/__init__.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/keystone/contrib/kds/api/app.py b/keystone/contrib/kds/api/app.py index 8373e2ab6c..582d88637b 100644 --- a/keystone/contrib/kds/api/app.py +++ b/keystone/contrib/kds/api/app.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/keystone/contrib/kds/api/config.py b/keystone/contrib/kds/api/config.py index d376b58e75..6d7a2e66b6 100644 --- a/keystone/contrib/kds/api/config.py +++ b/keystone/contrib/kds/api/config.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/keystone/contrib/kds/api/hooks.py b/keystone/contrib/kds/api/hooks.py index 3c1578c6cd..105f395678 100644 --- a/keystone/contrib/kds/api/hooks.py +++ b/keystone/contrib/kds/api/hooks.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/keystone/contrib/kds/api/root.py b/keystone/contrib/kds/api/root.py index 5a6e79f61c..6ede1e3bad 100644 --- a/keystone/contrib/kds/api/root.py +++ b/keystone/contrib/kds/api/root.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/keystone/contrib/kds/cli/__init__.py b/keystone/contrib/kds/cli/__init__.py index 8c6d5f866c..0680747644 100644 --- a/keystone/contrib/kds/cli/__init__.py +++ b/keystone/contrib/kds/cli/__init__.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/keystone/contrib/kds/cli/api.py b/keystone/contrib/kds/cli/api.py index 8f111b6547..414ee88087 100644 --- a/keystone/contrib/kds/cli/api.py +++ b/keystone/contrib/kds/cli/api.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/keystone/contrib/kds/cli/manage.py b/keystone/contrib/kds/cli/manage.py index c13de289b5..64a36a4ce8 100644 --- a/keystone/contrib/kds/cli/manage.py +++ b/keystone/contrib/kds/cli/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/keystone/contrib/kds/common/__init__.py b/keystone/contrib/kds/common/__init__.py index 8c6d5f866c..0680747644 100644 --- a/keystone/contrib/kds/common/__init__.py +++ b/keystone/contrib/kds/common/__init__.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/keystone/contrib/kds/common/exception.py b/keystone/contrib/kds/common/exception.py index 0126e3222c..e255a7a2ce 100644 --- a/keystone/contrib/kds/common/exception.py +++ b/keystone/contrib/kds/common/exception.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/keystone/contrib/kds/common/service.py b/keystone/contrib/kds/common/service.py index f9fa6ea2d8..e90fdacaf0 100644 --- a/keystone/contrib/kds/common/service.py +++ b/keystone/contrib/kds/common/service.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/keystone/contrib/kds/common/utils.py b/keystone/contrib/kds/common/utils.py index 77e364970a..897b439d8c 100644 --- a/keystone/contrib/kds/common/utils.py +++ b/keystone/contrib/kds/common/utils.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/keystone/contrib/kds/db/api.py b/keystone/contrib/kds/db/api.py index a6861b4837..e85db03598 100644 --- a/keystone/contrib/kds/db/api.py +++ b/keystone/contrib/kds/db/api.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/keystone/contrib/kds/db/connection.py b/keystone/contrib/kds/db/connection.py index 1f959aab44..df875c0616 100644 --- a/keystone/contrib/kds/db/connection.py +++ b/keystone/contrib/kds/db/connection.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/keystone/contrib/kds/db/kvs/api.py b/keystone/contrib/kds/db/kvs/api.py index 2e267cdd10..4ee37074aa 100644 --- a/keystone/contrib/kds/db/kvs/api.py +++ b/keystone/contrib/kds/db/kvs/api.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/keystone/contrib/kds/db/migration.py b/keystone/contrib/kds/db/migration.py index ea8ab225c6..c114a6af42 100644 --- a/keystone/contrib/kds/db/migration.py +++ b/keystone/contrib/kds/db/migration.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/keystone/contrib/kds/db/sqlalchemy/api.py b/keystone/contrib/kds/db/sqlalchemy/api.py index 74049e6311..cae129d724 100644 --- a/keystone/contrib/kds/db/sqlalchemy/api.py +++ b/keystone/contrib/kds/db/sqlalchemy/api.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/keystone/contrib/kds/db/sqlalchemy/migrate_repo/manage.py b/keystone/contrib/kds/db/sqlalchemy/migrate_repo/manage.py index a7e6e509c5..5e411b6e7e 100644 --- a/keystone/contrib/kds/db/sqlalchemy/migrate_repo/manage.py +++ b/keystone/contrib/kds/db/sqlalchemy/migrate_repo/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/keystone/contrib/kds/db/sqlalchemy/migrate_repo/versions/001_kds_table.py b/keystone/contrib/kds/db/sqlalchemy/migrate_repo/versions/001_kds_table.py index 6725221522..79565e3521 100644 --- a/keystone/contrib/kds/db/sqlalchemy/migrate_repo/versions/001_kds_table.py +++ b/keystone/contrib/kds/db/sqlalchemy/migrate_repo/versions/001_kds_table.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/keystone/contrib/kds/db/sqlalchemy/migration.py b/keystone/contrib/kds/db/sqlalchemy/migration.py index 61c631033f..99f8a5be83 100644 --- a/keystone/contrib/kds/db/sqlalchemy/migration.py +++ b/keystone/contrib/kds/db/sqlalchemy/migration.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/keystone/contrib/kds/db/sqlalchemy/models.py b/keystone/contrib/kds/db/sqlalchemy/models.py index 32dc476dc2..39232dea11 100644 --- a/keystone/contrib/kds/db/sqlalchemy/models.py +++ b/keystone/contrib/kds/db/sqlalchemy/models.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/keystone/contrib/oauth1/__init__.py b/keystone/contrib/oauth1/__init__.py index fdb8dc4b71..1dd804b658 100644 --- a/keystone/contrib/oauth1/__init__.py +++ b/keystone/contrib/oauth1/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/oauth1/backends/__init__.py b/keystone/contrib/oauth1/backends/__init__.py index 3f393b269a..e16ae780e5 100644 --- a/keystone/contrib/oauth1/backends/__init__.py +++ b/keystone/contrib/oauth1/backends/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/oauth1/backends/sql.py b/keystone/contrib/oauth1/backends/sql.py index 429a948307..204cc2f856 100644 --- a/keystone/contrib/oauth1/backends/sql.py +++ b/keystone/contrib/oauth1/backends/sql.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/oauth1/controllers.py b/keystone/contrib/oauth1/controllers.py index 85cfec8b36..0ca99de0a1 100644 --- a/keystone/contrib/oauth1/controllers.py +++ b/keystone/contrib/oauth1/controllers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/oauth1/core.py b/keystone/contrib/oauth1/core.py index d184f28c33..36f2b7bc80 100644 --- a/keystone/contrib/oauth1/core.py +++ b/keystone/contrib/oauth1/core.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/oauth1/migrate_repo/__init__.py b/keystone/contrib/oauth1/migrate_repo/__init__.py index 3f393b269a..e16ae780e5 100644 --- a/keystone/contrib/oauth1/migrate_repo/__init__.py +++ b/keystone/contrib/oauth1/migrate_repo/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/oauth1/migrate_repo/versions/001_add_oauth_tables.py b/keystone/contrib/oauth1/migrate_repo/versions/001_add_oauth_tables.py index d3ed9033d6..a4fbf155b1 100644 --- a/keystone/contrib/oauth1/migrate_repo/versions/001_add_oauth_tables.py +++ b/keystone/contrib/oauth1/migrate_repo/versions/001_add_oauth_tables.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/oauth1/migrate_repo/versions/002_fix_oauth_tables_fk.py b/keystone/contrib/oauth1/migrate_repo/versions/002_fix_oauth_tables_fk.py index b621b493c6..0504613aef 100644 --- a/keystone/contrib/oauth1/migrate_repo/versions/002_fix_oauth_tables_fk.py +++ b/keystone/contrib/oauth1/migrate_repo/versions/002_fix_oauth_tables_fk.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/oauth1/migrate_repo/versions/003_consumer_description_nullalbe.py b/keystone/contrib/oauth1/migrate_repo/versions/003_consumer_description_nullalbe.py index 3cfc547651..e1cf8843ec 100644 --- a/keystone/contrib/oauth1/migrate_repo/versions/003_consumer_description_nullalbe.py +++ b/keystone/contrib/oauth1/migrate_repo/versions/003_consumer_description_nullalbe.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/oauth1/migrate_repo/versions/004_request_token_roles_nullable.py b/keystone/contrib/oauth1/migrate_repo/versions/004_request_token_roles_nullable.py index aec13b8d1f..5e33c5ba93 100644 --- a/keystone/contrib/oauth1/migrate_repo/versions/004_request_token_roles_nullable.py +++ b/keystone/contrib/oauth1/migrate_repo/versions/004_request_token_roles_nullable.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/oauth1/migrate_repo/versions/__init__.py b/keystone/contrib/oauth1/migrate_repo/versions/__init__.py index 3f393b269a..e16ae780e5 100644 --- a/keystone/contrib/oauth1/migrate_repo/versions/__init__.py +++ b/keystone/contrib/oauth1/migrate_repo/versions/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/oauth1/routers.py b/keystone/contrib/oauth1/routers.py index 435088e4bf..238a135b92 100644 --- a/keystone/contrib/oauth1/routers.py +++ b/keystone/contrib/oauth1/routers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/oauth1/validator.py b/keystone/contrib/oauth1/validator.py index 8a98a5dde5..b05d9a9f49 100644 --- a/keystone/contrib/oauth1/validator.py +++ b/keystone/contrib/oauth1/validator.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2014 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/contrib/s3/__init__.py b/keystone/contrib/s3/__init__.py index 518ca4a270..076ff82e94 100644 --- a/keystone/contrib/s3/__init__.py +++ b/keystone/contrib/s3/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # flake8: noqa # Copyright 2012 OpenStack Foundation diff --git a/keystone/contrib/s3/core.py b/keystone/contrib/s3/core.py index dbbc5af971..57af196d72 100644 --- a/keystone/contrib/s3/core.py +++ b/keystone/contrib/s3/core.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/keystone/contrib/simple_cert/__init__.py b/keystone/contrib/simple_cert/__init__.py index 06eae55518..89650a8036 100644 --- a/keystone/contrib/simple_cert/__init__.py +++ b/keystone/contrib/simple_cert/__init__.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/keystone/contrib/simple_cert/controllers.py b/keystone/contrib/simple_cert/controllers.py index 653bca1eb6..97598da973 100644 --- a/keystone/contrib/simple_cert/controllers.py +++ b/keystone/contrib/simple_cert/controllers.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/keystone/contrib/simple_cert/core.py b/keystone/contrib/simple_cert/core.py index 185def4623..531c6aae11 100644 --- a/keystone/contrib/simple_cert/core.py +++ b/keystone/contrib/simple_cert/core.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/keystone/contrib/simple_cert/routers.py b/keystone/contrib/simple_cert/routers.py index 9ecbb337b2..7b9fc72486 100644 --- a/keystone/contrib/simple_cert/routers.py +++ b/keystone/contrib/simple_cert/routers.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/keystone/contrib/stats/__init__.py b/keystone/contrib/stats/__init__.py index db880bc421..3b72711e2c 100644 --- a/keystone/contrib/stats/__init__.py +++ b/keystone/contrib/stats/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # flake8: noqa # Copyright 2012 OpenStack Foundation diff --git a/keystone/contrib/stats/backends/kvs.py b/keystone/contrib/stats/backends/kvs.py index 1f347ffc89..0cc9fb5544 100644 --- a/keystone/contrib/stats/backends/kvs.py +++ b/keystone/contrib/stats/backends/kvs.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/keystone/contrib/stats/core.py b/keystone/contrib/stats/core.py index c8cac9e870..3eb85f249b 100644 --- a/keystone/contrib/stats/core.py +++ b/keystone/contrib/stats/core.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/keystone/contrib/user_crud/__init__.py b/keystone/contrib/user_crud/__init__.py index a07019f1ef..795c98c5c3 100644 --- a/keystone/contrib/user_crud/__init__.py +++ b/keystone/contrib/user_crud/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # flake8: noqa # Copyright 2012 Red Hat, Inc diff --git a/keystone/contrib/user_crud/core.py b/keystone/contrib/user_crud/core.py index 15be597fef..460be911ea 100644 --- a/keystone/contrib/user_crud/core.py +++ b/keystone/contrib/user_crud/core.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/keystone/controllers.py b/keystone/controllers.py index a1bab30ffa..cbdfbdac17 100644 --- a/keystone/controllers.py +++ b/keystone/controllers.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/keystone/credential/__init__.py b/keystone/credential/__init__.py index 621f7a13bb..9e01cee1a7 100644 --- a/keystone/credential/__init__.py +++ b/keystone/credential/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # flake8: noqa # Copyright 2013 OpenStack Foundation diff --git a/keystone/credential/backends/sql.py b/keystone/credential/backends/sql.py index 7eb32ee3ea..00df31e0e9 100644 --- a/keystone/credential/backends/sql.py +++ b/keystone/credential/backends/sql.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/credential/controllers.py b/keystone/credential/controllers.py index de9752dc86..8fcdec96c0 100644 --- a/keystone/credential/controllers.py +++ b/keystone/credential/controllers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/credential/core.py b/keystone/credential/core.py index 11f3b7ff1f..80b98700e3 100644 --- a/keystone/credential/core.py +++ b/keystone/credential/core.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/credential/routers.py b/keystone/credential/routers.py index 06378b9663..75cd334316 100644 --- a/keystone/credential/routers.py +++ b/keystone/credential/routers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/exception.py b/keystone/exception.py index 09930b8c0f..60bdc4e44a 100644 --- a/keystone/exception.py +++ b/keystone/exception.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/keystone/identity/__init__.py b/keystone/identity/__init__.py index 0bb3094ae9..5e179a36eb 100644 --- a/keystone/identity/__init__.py +++ b/keystone/identity/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # flake8: noqa # Copyright 2012 OpenStack Foundation diff --git a/keystone/identity/backends/kvs.py b/keystone/identity/backends/kvs.py index 9cb9bd763c..22dc3e725f 100644 --- a/keystone/identity/backends/kvs.py +++ b/keystone/identity/backends/kvs.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/keystone/identity/backends/ldap.py b/keystone/identity/backends/ldap.py index 13d2769a22..13aa3f7ee7 100644 --- a/keystone/identity/backends/ldap.py +++ b/keystone/identity/backends/ldap.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/keystone/identity/backends/pam.py b/keystone/identity/backends/pam.py index 67827e746b..11dceaa34f 100644 --- a/keystone/identity/backends/pam.py +++ b/keystone/identity/backends/pam.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/keystone/identity/backends/sql.py b/keystone/identity/backends/sql.py index 742c473fe4..c7d9a429d1 100644 --- a/keystone/identity/backends/sql.py +++ b/keystone/identity/backends/sql.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/keystone/identity/controllers.py b/keystone/identity/controllers.py index 1007bc9730..de55da7ccd 100644 --- a/keystone/identity/controllers.py +++ b/keystone/identity/controllers.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/keystone/identity/core.py b/keystone/identity/core.py index 106d556826..94d6f54038 100644 --- a/keystone/identity/core.py +++ b/keystone/identity/core.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/keystone/identity/routers.py b/keystone/identity/routers.py index c7a94ea3c3..6306dd718a 100644 --- a/keystone/identity/routers.py +++ b/keystone/identity/routers.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/keystone/middleware/__init__.py b/keystone/middleware/__init__.py index 9bfd68fff3..d805f82d84 100644 --- a/keystone/middleware/__init__.py +++ b/keystone/middleware/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # flake8: noqa # Copyright 2012 OpenStack Foundation diff --git a/keystone/middleware/core.py b/keystone/middleware/core.py index 11bd21d724..8d6cf51852 100644 --- a/keystone/middleware/core.py +++ b/keystone/middleware/core.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/keystone/middleware/ec2_token.py b/keystone/middleware/ec2_token.py index 1f4e8c8a5c..3658908481 100644 --- a/keystone/middleware/ec2_token.py +++ b/keystone/middleware/ec2_token.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/keystone/middleware/s3_token.py b/keystone/middleware/s3_token.py index 6e55001d5c..5533427ae5 100644 --- a/keystone/middleware/s3_token.py +++ b/keystone/middleware/s3_token.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/keystone/notifications.py b/keystone/notifications.py index 6f010211da..13965f05f9 100644 --- a/keystone/notifications.py +++ b/keystone/notifications.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/policy/__init__.py b/keystone/policy/__init__.py index 5e48375454..0756589d48 100644 --- a/keystone/policy/__init__.py +++ b/keystone/policy/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # flake8: noqa # Copyright 2012 OpenStack Foundation diff --git a/keystone/policy/backends/rules.py b/keystone/policy/backends/rules.py index cc4edf47cc..2f3aa0df49 100644 --- a/keystone/policy/backends/rules.py +++ b/keystone/policy/backends/rules.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack, LLC. # All Rights Reserved. # diff --git a/keystone/policy/backends/sql.py b/keystone/policy/backends/sql.py index 1823be9c56..fa9241c331 100644 --- a/keystone/policy/backends/sql.py +++ b/keystone/policy/backends/sql.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack LLC # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/policy/controllers.py b/keystone/policy/controllers.py index a6527491d0..3fa5124794 100644 --- a/keystone/policy/controllers.py +++ b/keystone/policy/controllers.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/keystone/policy/core.py b/keystone/policy/core.py index 2c4a8b2446..aa1e4de047 100644 --- a/keystone/policy/core.py +++ b/keystone/policy/core.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/keystone/policy/routers.py b/keystone/policy/routers.py index da9c6cb0b2..96a524bd79 100644 --- a/keystone/policy/routers.py +++ b/keystone/policy/routers.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/keystone/routers.py b/keystone/routers.py index 9bf6b0027f..73cd47cd03 100644 --- a/keystone/routers.py +++ b/keystone/routers.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/keystone/service.py b/keystone/service.py index 734cab7113..bb2dd0baa0 100644 --- a/keystone/service.py +++ b/keystone/service.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/keystone/tests/__init__.py b/keystone/tests/__init__.py index 9773cf2643..ae37851a11 100644 --- a/keystone/tests/__init__.py +++ b/keystone/tests/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/_ldap_livetest.py b/keystone/tests/_ldap_livetest.py index b71a8809e0..a949f8e474 100644 --- a/keystone/tests/_ldap_livetest.py +++ b/keystone/tests/_ldap_livetest.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/keystone/tests/_ldap_tls_livetest.py b/keystone/tests/_ldap_tls_livetest.py index 3d5d01991f..02c1b89614 100644 --- a/keystone/tests/_ldap_tls_livetest.py +++ b/keystone/tests/_ldap_tls_livetest.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # Copyright 2013 IBM Corp. # diff --git a/keystone/tests/_sql_livetest.py b/keystone/tests/_sql_livetest.py index b6e1a0d5eb..ad17d39383 100644 --- a/keystone/tests/_sql_livetest.py +++ b/keystone/tests/_sql_livetest.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/keystone/tests/contrib/__init__.py b/keystone/tests/contrib/__init__.py index 8c6d5f866c..0680747644 100644 --- a/keystone/tests/contrib/__init__.py +++ b/keystone/tests/contrib/__init__.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/keystone/tests/contrib/kds/__init__.py b/keystone/tests/contrib/kds/__init__.py index 8c6d5f866c..0680747644 100644 --- a/keystone/tests/contrib/kds/__init__.py +++ b/keystone/tests/contrib/kds/__init__.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/keystone/tests/contrib/kds/api/__init__.py b/keystone/tests/contrib/kds/api/__init__.py index 8c6d5f866c..0680747644 100644 --- a/keystone/tests/contrib/kds/api/__init__.py +++ b/keystone/tests/contrib/kds/api/__init__.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/keystone/tests/contrib/kds/api/base.py b/keystone/tests/contrib/kds/api/base.py index 566abb609c..622d7a36d5 100644 --- a/keystone/tests/contrib/kds/api/base.py +++ b/keystone/tests/contrib/kds/api/base.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/keystone/tests/contrib/kds/api/test.py b/keystone/tests/contrib/kds/api/test.py index b49fc19f5a..de8eee22a6 100644 --- a/keystone/tests/contrib/kds/api/test.py +++ b/keystone/tests/contrib/kds/api/test.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/keystone/tests/contrib/kds/base.py b/keystone/tests/contrib/kds/base.py index 4cc4e7e56e..fd8d509f84 100644 --- a/keystone/tests/contrib/kds/base.py +++ b/keystone/tests/contrib/kds/base.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/keystone/tests/contrib/kds/db/base.py b/keystone/tests/contrib/kds/db/base.py index 2c06794521..e27784f9d4 100644 --- a/keystone/tests/contrib/kds/db/base.py +++ b/keystone/tests/contrib/kds/db/base.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/keystone/tests/contrib/kds/db/test_host_key.py b/keystone/tests/contrib/kds/db/test_host_key.py index 0ac2234ede..c8fa3511e3 100644 --- a/keystone/tests/contrib/kds/db/test_host_key.py +++ b/keystone/tests/contrib/kds/db/test_host_key.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/keystone/tests/contrib/kds/fixture/__init__.py b/keystone/tests/contrib/kds/fixture/__init__.py index 313ae27960..31708f0fed 100644 --- a/keystone/tests/contrib/kds/fixture/__init__.py +++ b/keystone/tests/contrib/kds/fixture/__init__.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/keystone/tests/contrib/kds/fixture/kvsdb.py b/keystone/tests/contrib/kds/fixture/kvsdb.py index 1426b281f8..c6f2d508cc 100644 --- a/keystone/tests/contrib/kds/fixture/kvsdb.py +++ b/keystone/tests/contrib/kds/fixture/kvsdb.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/keystone/tests/contrib/kds/fixture/sqlitedb.py b/keystone/tests/contrib/kds/fixture/sqlitedb.py index 6606605873..677345d789 100644 --- a/keystone/tests/contrib/kds/fixture/sqlitedb.py +++ b/keystone/tests/contrib/kds/fixture/sqlitedb.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/keystone/tests/contrib/kds/paths.py b/keystone/tests/contrib/kds/paths.py index 41b48e5cfe..41af315fd1 100644 --- a/keystone/tests/contrib/kds/paths.py +++ b/keystone/tests/contrib/kds/paths.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/keystone/tests/core.py b/keystone/tests/core.py index a7f38c36c3..4afe02a094 100644 --- a/keystone/tests/core.py +++ b/keystone/tests/core.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/keystone/tests/default_fixtures.py b/keystone/tests/default_fixtures.py index 0d47f3acd8..f25a855070 100644 --- a/keystone/tests/default_fixtures.py +++ b/keystone/tests/default_fixtures.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/keystone/tests/fakeldap.py b/keystone/tests/fakeldap.py index f2ec270660..a3ef9bebeb 100644 --- a/keystone/tests/fakeldap.py +++ b/keystone/tests/fakeldap.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/keystone/tests/filtering.py b/keystone/tests/filtering.py index 419a826337..47deb6911c 100644 --- a/keystone/tests/filtering.py +++ b/keystone/tests/filtering.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/fixtures/appserver.py b/keystone/tests/fixtures/appserver.py index 7d8d90f861..63b86dae43 100644 --- a/keystone/tests/fixtures/appserver.py +++ b/keystone/tests/fixtures/appserver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/keystone/tests/mapping_fixtures.py b/keystone/tests/mapping_fixtures.py index fca05036d2..e1db720a6f 100644 --- a/keystone/tests/mapping_fixtures.py +++ b/keystone/tests/mapping_fixtures.py @@ -1,6 +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/keystone/tests/matchers.py b/keystone/tests/matchers.py index a0a0b79996..f904d339cb 100644 --- a/keystone/tests/matchers.py +++ b/keystone/tests/matchers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/rest.py b/keystone/tests/rest.py index 42010ca19b..caedcee0d9 100644 --- a/keystone/tests/rest.py +++ b/keystone/tests/rest.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/test_associate_project_endpoint_extension.py b/keystone/tests/test_associate_project_endpoint_extension.py index aae97ac538..de5fdbe1a3 100644 --- a/keystone/tests/test_associate_project_endpoint_extension.py +++ b/keystone/tests/test_associate_project_endpoint_extension.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/test_auth_plugin.py b/keystone/tests/test_auth_plugin.py index 8001f3c02c..d401cd7aa9 100644 --- a/keystone/tests/test_auth_plugin.py +++ b/keystone/tests/test_auth_plugin.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/test_backend.py b/keystone/tests/test_backend.py index efc1180308..f843376e53 100644 --- a/keystone/tests/test_backend.py +++ b/keystone/tests/test_backend.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/keystone/tests/test_backend_federation_sql.py b/keystone/tests/test_backend_federation_sql.py index 5c238e3504..0ca2d962e7 100644 --- a/keystone/tests/test_backend_federation_sql.py +++ b/keystone/tests/test_backend_federation_sql.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/test_backend_kvs.py b/keystone/tests/test_backend_kvs.py index 683a538bba..a40257dbcc 100644 --- a/keystone/tests/test_backend_kvs.py +++ b/keystone/tests/test_backend_kvs.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/keystone/tests/test_backend_ldap.py b/keystone/tests/test_backend_ldap.py index 061783a99c..e677ff8296 100644 --- a/keystone/tests/test_backend_ldap.py +++ b/keystone/tests/test_backend_ldap.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # Copyright 2013 IBM Corp. # diff --git a/keystone/tests/test_backend_memcache.py b/keystone/tests/test_backend_memcache.py index 9da8bbe4bd..12c587ef72 100644 --- a/keystone/tests/test_backend_memcache.py +++ b/keystone/tests/test_backend_memcache.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/keystone/tests/test_backend_pam.py b/keystone/tests/test_backend_pam.py index cb4906cc3f..ec27f75697 100644 --- a/keystone/tests/test_backend_pam.py +++ b/keystone/tests/test_backend_pam.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/keystone/tests/test_backend_sql.py b/keystone/tests/test_backend_sql.py index 358ff71d55..03ffbce6b4 100644 --- a/keystone/tests/test_backend_sql.py +++ b/keystone/tests/test_backend_sql.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/keystone/tests/test_backend_templated.py b/keystone/tests/test_backend_templated.py index c0c55e129d..c2fa559e59 100644 --- a/keystone/tests/test_backend_templated.py +++ b/keystone/tests/test_backend_templated.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/keystone/tests/test_base64utils.py b/keystone/tests/test_base64utils.py index 27da716b71..1af09c37fe 100644 --- a/keystone/tests/test_base64utils.py +++ b/keystone/tests/test_base64utils.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/keystone/tests/test_cache.py b/keystone/tests/test_cache.py index 12a0508aba..70d735511d 100644 --- a/keystone/tests/test_cache.py +++ b/keystone/tests/test_cache.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Metacloud # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/test_catalog.py b/keystone/tests/test_catalog.py index 5579b17325..559d956162 100644 --- a/keystone/tests/test_catalog.py +++ b/keystone/tests/test_catalog.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/test_cert_setup.py b/keystone/tests/test_cert_setup.py index 4e9e9146c3..dcd3d07482 100644 --- a/keystone/tests/test_cert_setup.py +++ b/keystone/tests/test_cert_setup.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"); diff --git a/keystone/tests/test_config.py b/keystone/tests/test_config.py index 35d95b8f1a..9998c8326c 100644 --- a/keystone/tests/test_config.py +++ b/keystone/tests/test_config.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/test_content_types.py b/keystone/tests/test_content_types.py index 73dbb56cdc..5233cec818 100644 --- a/keystone/tests/test_content_types.py +++ b/keystone/tests/test_content_types.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/keystone/tests/test_contrib_s3_core.py b/keystone/tests/test_contrib_s3_core.py index 66f8066a95..8d3c561292 100644 --- a/keystone/tests/test_contrib_s3_core.py +++ b/keystone/tests/test_contrib_s3_core.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/keystone/tests/test_contrib_simple_cert.py b/keystone/tests/test_contrib_simple_cert.py index a71b43499d..e81f5ed55e 100644 --- a/keystone/tests/test_contrib_simple_cert.py +++ b/keystone/tests/test_contrib_simple_cert.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/keystone/tests/test_contrib_stats_core.py b/keystone/tests/test_contrib_stats_core.py index 85356940a1..9060f1fd3f 100644 --- a/keystone/tests/test_contrib_stats_core.py +++ b/keystone/tests/test_contrib_stats_core.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/keystone/tests/test_driver_hints.py b/keystone/tests/test_driver_hints.py index 2592ad2d99..acb2967351 100644 --- a/keystone/tests/test_driver_hints.py +++ b/keystone/tests/test_driver_hints.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/test_exception.py b/keystone/tests/test_exception.py index d8158f0a68..10a79a648e 100644 --- a/keystone/tests/test_exception.py +++ b/keystone/tests/test_exception.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/keystone/tests/test_injection.py b/keystone/tests/test_injection.py index 34250a11cd..acfc87773f 100644 --- a/keystone/tests/test_injection.py +++ b/keystone/tests/test_injection.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/keystone/tests/test_ipv6.py b/keystone/tests/test_ipv6.py index 24838c8e49..02c5bea2d4 100644 --- a/keystone/tests/test_ipv6.py +++ b/keystone/tests/test_ipv6.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"); diff --git a/keystone/tests/test_keystoneclient.py b/keystone/tests/test_keystoneclient.py index cce7c13b18..6fa3b87f8d 100644 --- a/keystone/tests/test_keystoneclient.py +++ b/keystone/tests/test_keystoneclient.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/keystone/tests/test_keystoneclient_sql.py b/keystone/tests/test_keystoneclient_sql.py index a8b562abe6..6a1e16482d 100644 --- a/keystone/tests/test_keystoneclient_sql.py +++ b/keystone/tests/test_keystoneclient_sql.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/keystone/tests/test_matchers.py b/keystone/tests/test_matchers.py index a8b1b53c03..b1c324a2df 100644 --- a/keystone/tests/test_matchers.py +++ b/keystone/tests/test_matchers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/test_middleware.py b/keystone/tests/test_middleware.py index a2760bfe27..6f3cfaa61b 100644 --- a/keystone/tests/test_middleware.py +++ b/keystone/tests/test_middleware.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/keystone/tests/test_no_admin_token_auth.py b/keystone/tests/test_no_admin_token_auth.py index 5c2817903b..9b0bdf48af 100644 --- a/keystone/tests/test_no_admin_token_auth.py +++ b/keystone/tests/test_no_admin_token_auth.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/test_notifications.py b/keystone/tests/test_notifications.py index 5528fb39b1..45f9b36788 100644 --- a/keystone/tests/test_notifications.py +++ b/keystone/tests/test_notifications.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/test_pemutils.py b/keystone/tests/test_pemutils.py index adc521f256..5ce6543983 100644 --- a/keystone/tests/test_pemutils.py +++ b/keystone/tests/test_pemutils.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/keystone/tests/test_policy.py b/keystone/tests/test_policy.py index 4878e80760..9a93f25b38 100644 --- a/keystone/tests/test_policy.py +++ b/keystone/tests/test_policy.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Piston Cloud Computing, Inc. # All Rights Reserved. diff --git a/keystone/tests/test_s3_token_middleware.py b/keystone/tests/test_s3_token_middleware.py index e425ee34e0..d8056f6e6c 100644 --- a/keystone/tests/test_s3_token_middleware.py +++ b/keystone/tests/test_s3_token_middleware.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/keystone/tests/test_serializer.py b/keystone/tests/test_serializer.py index bda75f8b70..ec2259e46f 100644 --- a/keystone/tests/test_serializer.py +++ b/keystone/tests/test_serializer.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/keystone/tests/test_singular_plural.py b/keystone/tests/test_singular_plural.py index 652a78b635..95733b64bb 100644 --- a/keystone/tests/test_singular_plural.py +++ b/keystone/tests/test_singular_plural.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/keystone/tests/test_sql_migrate_extensions.py b/keystone/tests/test_sql_migrate_extensions.py index 604975b88e..c490a8e723 100644 --- a/keystone/tests/test_sql_migrate_extensions.py +++ b/keystone/tests/test_sql_migrate_extensions.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/keystone/tests/test_sql_upgrade.py b/keystone/tests/test_sql_upgrade.py index 31e3703964..22316ff090 100644 --- a/keystone/tests/test_sql_upgrade.py +++ b/keystone/tests/test_sql_upgrade.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/keystone/tests/test_ssl.py b/keystone/tests/test_ssl.py index ed38e849a9..53a574d595 100644 --- a/keystone/tests/test_ssl.py +++ b/keystone/tests/test_ssl.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"); diff --git a/keystone/tests/test_token_provider.py b/keystone/tests/test_token_provider.py index b25aa05a39..2a41350f9c 100644 --- a/keystone/tests/test_token_provider.py +++ b/keystone/tests/test_token_provider.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/test_url_middleware.py b/keystone/tests/test_url_middleware.py index b27b7d5016..180bd24e7e 100644 --- a/keystone/tests/test_url_middleware.py +++ b/keystone/tests/test_url_middleware.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/keystone/tests/test_utils.py b/keystone/tests/test_utils.py index 2a45f285c3..1426131d5d 100644 --- a/keystone/tests/test_utils.py +++ b/keystone/tests/test_utils.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/keystone/tests/test_v3.py b/keystone/tests/test_v3.py index d6eafa0a0d..3dd62779ba 100644 --- a/keystone/tests/test_v3.py +++ b/keystone/tests/test_v3.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/test_v3_catalog.py b/keystone/tests/test_v3_catalog.py index 8edc45a8bb..a9ae9b25d2 100644 --- a/keystone/tests/test_v3_catalog.py +++ b/keystone/tests/test_v3_catalog.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/test_v3_credential.py b/keystone/tests/test_v3_credential.py index a2a5bd2815..a9083b9b05 100644 --- a/keystone/tests/test_v3_credential.py +++ b/keystone/tests/test_v3_credential.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/test_v3_federation.py b/keystone/tests/test_v3_federation.py index cd7fd34405..b7164d9dfe 100644 --- a/keystone/tests/test_v3_federation.py +++ b/keystone/tests/test_v3_federation.py @@ -1,6 +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/keystone/tests/test_v3_filters.py b/keystone/tests/test_v3_filters.py index 216700a56a..1775439a76 100644 --- a/keystone/tests/test_v3_filters.py +++ b/keystone/tests/test_v3_filters.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack LLC # Copyright 2013 IBM Corp. # diff --git a/keystone/tests/test_v3_identity.py b/keystone/tests/test_v3_identity.py index a4969389b0..f522972049 100644 --- a/keystone/tests/test_v3_identity.py +++ b/keystone/tests/test_v3_identity.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/keystone/tests/test_v3_oauth1.py b/keystone/tests/test_v3_oauth1.py index 09664c4808..1053f57fa1 100644 --- a/keystone/tests/test_v3_oauth1.py +++ b/keystone/tests/test_v3_oauth1.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/test_v3_policy.py b/keystone/tests/test_v3_policy.py index b49f4b38c1..e8eecaf397 100644 --- a/keystone/tests/test_v3_policy.py +++ b/keystone/tests/test_v3_policy.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/tests/test_v3_protection.py b/keystone/tests/test_v3_protection.py index 864cffccfd..4d2ec535a2 100644 --- a/keystone/tests/test_v3_protection.py +++ b/keystone/tests/test_v3_protection.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # Copyright 2013 IBM Corp. # diff --git a/keystone/tests/test_versions.py b/keystone/tests/test_versions.py index 2bbeaca5a9..1e8ed4f570 100644 --- a/keystone/tests/test_versions.py +++ b/keystone/tests/test_versions.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"); diff --git a/keystone/tests/test_wsgi.py b/keystone/tests/test_wsgi.py index 7d372912cd..65459f5706 100644 --- a/keystone/tests/test_wsgi.py +++ b/keystone/tests/test_wsgi.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/keystone/token/__init__.py b/keystone/token/__init__.py index a120002c4c..3b9c0f69d1 100644 --- a/keystone/token/__init__.py +++ b/keystone/token/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # flake8: noqa # Copyright 2012 OpenStack Foundation diff --git a/keystone/token/backends/memcache.py b/keystone/token/backends/memcache.py index f641e367fa..e32b8078bb 100644 --- a/keystone/token/backends/memcache.py +++ b/keystone/token/backends/memcache.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/keystone/token/backends/sql.py b/keystone/token/backends/sql.py index 89c9cdd977..a9d252b26e 100644 --- a/keystone/token/backends/sql.py +++ b/keystone/token/backends/sql.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/keystone/token/controllers.py b/keystone/token/controllers.py index 05be38a540..fdc91d9ac5 100644 --- a/keystone/token/controllers.py +++ b/keystone/token/controllers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/token/core.py b/keystone/token/core.py index 829c697258..adfc56d6c2 100644 --- a/keystone/token/core.py +++ b/keystone/token/core.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/keystone/token/provider.py b/keystone/token/provider.py index d6c797ca43..e818ff993a 100644 --- a/keystone/token/provider.py +++ b/keystone/token/provider.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/keystone/token/providers/common.py b/keystone/token/providers/common.py index 48925ac6d0..8e99fee7be 100644 --- a/keystone/token/providers/common.py +++ b/keystone/token/providers/common.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/token/providers/pki.py b/keystone/token/providers/pki.py index 4a17631626..72ba009b69 100644 --- a/keystone/token/providers/pki.py +++ b/keystone/token/providers/pki.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/token/providers/uuid.py b/keystone/token/providers/uuid.py index a2e94a9d9f..5ab4d6b71f 100644 --- a/keystone/token/providers/uuid.py +++ b/keystone/token/providers/uuid.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/token/routers.py b/keystone/token/routers.py index 51c247bab2..b106cb7aca 100644 --- a/keystone/token/routers.py +++ b/keystone/token/routers.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/keystone/trust/__init__.py b/keystone/trust/__init__.py index aeda21037b..327b1cfd21 100644 --- a/keystone/trust/__init__.py +++ b/keystone/trust/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # flake8: noqa # Copyright 2012 OpenStack Foundation diff --git a/keystone/trust/backends/kvs.py b/keystone/trust/backends/kvs.py index bf49d358ad..f8c124237d 100644 --- a/keystone/trust/backends/kvs.py +++ b/keystone/trust/backends/kvs.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/keystone/trust/backends/sql.py b/keystone/trust/backends/sql.py index beaea6e5d4..89e24996a6 100644 --- a/keystone/trust/backends/sql.py +++ b/keystone/trust/backends/sql.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/keystone/trust/controllers.py b/keystone/trust/controllers.py index d4a8831d23..85d71ebbcb 100644 --- a/keystone/trust/controllers.py +++ b/keystone/trust/controllers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/keystone/trust/core.py b/keystone/trust/core.py index 1a2d838c69..7f1d97dbb6 100644 --- a/keystone/trust/core.py +++ b/keystone/trust/core.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/keystone/trust/routers.py b/keystone/trust/routers.py index e464a106f1..279f740abf 100644 --- a/keystone/trust/routers.py +++ b/keystone/trust/routers.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 e0f6ba39ae..e01ae3f06e 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 IBM Corp. # Copyright 2012 OpenStack Foundation # Copyright 2010 United States Government as represented by the