diff --git a/bin/manila-all b/bin/manila-all index 729fe01fc6..266efcf888 100755 --- a/bin/manila-all +++ b/bin/manila-all @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2011 OpenStack, LLC # Copyright 2010 United States Government as represented by the diff --git a/bin/manila-api b/bin/manila-api index 41f3fd825f..1c6c17e400 100755 --- a/bin/manila-api +++ b/bin/manila-api @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/bin/manila-manage b/bin/manila-manage index 15e14d1633..6a76f047ca 100755 --- a/bin/manila-manage +++ b/bin/manila-manage @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 United States Government as represented by the diff --git a/bin/manila-scheduler b/bin/manila-scheduler index 8e155775b1..a25a497d1b 100755 --- a/bin/manila-scheduler +++ b/bin/manila-scheduler @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/bin/manila-share b/bin/manila-share index 5f27161310..621d081841 100755 --- a/bin/manila-share +++ b/bin/manila-share @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2013 NetApp # All Rights Reserved. diff --git a/manila/__init__.py b/manila/__init__.py index 23375b7fa1..5ac22d4181 100644 --- a/manila/__init__.py +++ b/manila/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/manila/api/__init__.py b/manila/api/__init__.py index 676e6201e0..ef35fc4a2b 100644 --- a/manila/api/__init__.py +++ b/manila/api/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/manila/api/contrib/__init__.py b/manila/api/contrib/__init__.py index 45a33d4894..c76eb7f4a1 100644 --- a/manila/api/contrib/__init__.py +++ b/manila/api/contrib/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Justin Santa Barbara # All Rights Reserved. # diff --git a/manila/api/contrib/quotas.py b/manila/api/contrib/quotas.py index 288531ca56..224097d718 100644 --- a/manila/api/contrib/quotas.py +++ b/manila/api/contrib/quotas.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/api/contrib/services.py b/manila/api/contrib/services.py index 2f1815b733..33b4521d36 100644 --- a/manila/api/contrib/services.py +++ b/manila/api/contrib/services.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 IBM Corp. # All Rights Reserved. # diff --git a/manila/api/middleware/auth.py b/manila/api/middleware/auth.py index 2f6ec86cd6..88953caacf 100644 --- a/manila/api/middleware/auth.py +++ b/manila/api/middleware/auth.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/api/middleware/fault.py b/manila/api/middleware/fault.py index 9fcdbbc7bb..391fcb4033 100644 --- a/manila/api/middleware/fault.py +++ b/manila/api/middleware/fault.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/manila/api/middleware/sizelimit.py b/manila/api/middleware/sizelimit.py index 0429989c14..7d4a199956 100644 --- a/manila/api/middleware/sizelimit.py +++ b/manila/api/middleware/sizelimit.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack, LLC # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/manila/api/openstack/wsgi.py b/manila/api/openstack/wsgi.py index 141711cc9f..20c1c431bc 100644 --- a/manila/api/openstack/wsgi.py +++ b/manila/api/openstack/wsgi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/api/urlmap.py b/manila/api/urlmap.py index 9fdd5caff4..2a4fc9fed8 100644 --- a/manila/api/urlmap.py +++ b/manila/api/urlmap.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/api/v1/router.py b/manila/api/v1/router.py index f8c0bed703..b52102ca7b 100644 --- a/manila/api/v1/router.py +++ b/manila/api/v1/router.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack LLC. # Copyright 2011 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/manila/api/v1/share_metadata.py b/manila/api/v1/share_metadata.py index e26a5afa8c..00d14c4131 100644 --- a/manila/api/v1/share_metadata.py +++ b/manila/api/v1/share_metadata.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/manila/api/versions.py b/manila/api/versions.py index f9a19d90db..bb010e8f3d 100644 --- a/manila/api/versions.py +++ b/manila/api/versions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/api/views/security_service.py b/manila/api/views/security_service.py index 927802fd26..ce284447c2 100644 --- a/manila/api/views/security_service.py +++ b/manila/api/views/security_service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/api/views/share_networks.py b/manila/api/views/share_networks.py index 4c97d1c5f7..63c3b68341 100644 --- a/manila/api/views/share_networks.py +++ b/manila/api/views/share_networks.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2014 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/api/views/share_snapshots.py b/manila/api/views/share_snapshots.py index f95eec22b9..6d90b9c732 100644 --- a/manila/api/views/share_snapshots.py +++ b/manila/api/views/share_snapshots.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 NetApp # All Rights Reserved. # diff --git a/manila/api/views/shares.py b/manila/api/views/shares.py index ab80f77f35..d5953103ed 100644 --- a/manila/api/views/shares.py +++ b/manila/api/views/shares.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/api/views/versions.py b/manila/api/views/versions.py index d04cc17d20..01a4691163 100644 --- a/manila/api/views/versions.py +++ b/manila/api/views/versions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/api/xmlutil.py b/manila/api/xmlutil.py index ccb40a37bd..a93751a4b4 100644 --- a/manila/api/xmlutil.py +++ b/manila/api/xmlutil.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/common/config.py b/manila/common/config.py index 1844bb1924..d33bb0cb80 100644 --- a/manila/common/config.py +++ b/manila/common/config.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/manila/context.py b/manila/context.py index 7430c06a2c..8eed82b83e 100644 --- a/manila/context.py +++ b/manila/context.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack LLC. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/manila/db/__init__.py b/manila/db/__init__.py index 3129456ac0..a465c9a79b 100644 --- a/manila/db/__init__.py +++ b/manila/db/__init__.py @@ -1,6 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# 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/manila/db/api.py b/manila/db/api.py index 5f216a6c2c..ed1175e872 100644 --- a/manila/db/api.py +++ b/manila/db/api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/manila/db/base.py b/manila/db/base.py index 43ba6490eb..2b6a90e7f3 100644 --- a/manila/db/base.py +++ b/manila/db/base.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/manila/db/migration.py b/manila/db/migration.py index ef8a773e6f..d577bc6482 100644 --- a/manila/db/migration.py +++ b/manila/db/migration.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/manila/db/migrations/alembic/versions/162a3e673105_manila_init.py b/manila/db/migrations/alembic/versions/162a3e673105_manila_init.py index 6058f20819..27294fa20b 100644 --- a/manila/db/migrations/alembic/versions/162a3e673105_manila_init.py +++ b/manila/db/migrations/alembic/versions/162a3e673105_manila_init.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/manila/db/sqlalchemy/api.py b/manila/db/sqlalchemy/api.py index d38cf880b9..4b8d6cb024 100644 --- a/manila/db/sqlalchemy/api.py +++ b/manila/db/sqlalchemy/api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/manila/db/sqlalchemy/models.py b/manila/db/sqlalchemy/models.py index 8e778d7f0d..f7f34d951f 100644 --- a/manila/db/sqlalchemy/models.py +++ b/manila/db/sqlalchemy/models.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/manila/network/__init__.py b/manila/network/__init__.py index da333fe957..fedc0a2856 100644 --- a/manila/network/__init__.py +++ b/manila/network/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Openstack Foundation # All Rights Reserved. # diff --git a/manila/network/neutron/__init__.py b/manila/network/neutron/__init__.py index 1d681d2628..8a966880a0 100644 --- a/manila/network/neutron/__init__.py +++ b/manila/network/neutron/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2012 OpenStack Foundation # All Rights Reserved # diff --git a/manila/openstack/__init__.py b/manila/openstack/__init__.py index 0a3b98867a..00a266a597 100644 --- a/manila/openstack/__init__.py +++ b/manila/openstack/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/manila/scheduler/__init__.py b/manila/scheduler/__init__.py index c790d469e6..781d2826e0 100644 --- a/manila/scheduler/__init__.py +++ b/manila/scheduler/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 OpenStack, LLC. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/manila/scheduler/chance.py b/manila/scheduler/chance.py index 206fccd137..6021c24945 100644 --- a/manila/scheduler/chance.py +++ b/manila/scheduler/chance.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 OpenStack, LLC. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/manila/scheduler/driver.py b/manila/scheduler/driver.py index 74b3b310dd..f57f10b84e 100644 --- a/manila/scheduler/driver.py +++ b/manila/scheduler/driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 OpenStack, LLC. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/manila/scheduler/scheduler_options.py b/manila/scheduler/scheduler_options.py index bd075fa069..24b8be0283 100644 --- a/manila/scheduler/scheduler_options.py +++ b/manila/scheduler/scheduler_options.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack, LLC. # All Rights Reserved. # diff --git a/manila/scheduler/simple.py b/manila/scheduler/simple.py index 9f1de869da..238d88b3b8 100644 --- a/manila/scheduler/simple.py +++ b/manila/scheduler/simple.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 OpenStack, LLC. # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. diff --git a/manila/share/__init__.py b/manila/share/__init__.py index 760dac8c62..b5bc58e474 100644 --- a/manila/share/__init__.py +++ b/manila/share/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/manila/share/configuration.py b/manila/share/configuration.py index 7600ba4216..d3550b8c24 100644 --- a/manila/share/configuration.py +++ b/manila/share/configuration.py @@ -1,6 +1,5 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# + # Copyright (c) 2012 Rackspace Hosting # Copyright (c) 2013 NetApp # All Rights Reserved. diff --git a/manila/share/driver.py b/manila/share/driver.py index cb0729385e..16eed914e3 100644 --- a/manila/share/driver.py +++ b/manila/share/driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 NetApp # All Rights Reserved. # diff --git a/manila/share/drivers/glusterfs.py b/manila/share/drivers/glusterfs.py index f140526c11..7dd063ea8a 100644 --- a/manila/share/drivers/glusterfs.py +++ b/manila/share/drivers/glusterfs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2013 Red Hat, Inc. # All Rights Reserved. # diff --git a/manila/tests/api/common.py b/manila/tests/api/common.py index e030105653..2cb44fb151 100644 --- a/manila/tests/api/common.py +++ b/manila/tests/api/common.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/tests/api/contrib/stubs.py b/manila/tests/api/contrib/stubs.py index 62abec1cfc..764dbfef21 100644 --- a/manila/tests/api/contrib/stubs.py +++ b/manila/tests/api/contrib/stubs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/tests/api/extensions/foxinsocks.py b/manila/tests/api/extensions/foxinsocks.py index 47d8ee0837..50e4aa094d 100644 --- a/manila/tests/api/extensions/foxinsocks.py +++ b/manila/tests/api/extensions/foxinsocks.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/tests/api/fakes.py b/manila/tests/api/fakes.py index 659d9d25cb..810eaefb7d 100644 --- a/manila/tests/api/fakes.py +++ b/manila/tests/api/fakes.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/tests/api/middleware/test_faults.py b/manila/tests/api/middleware/test_faults.py index 97cd2a5a02..62d4741e64 100644 --- a/manila/tests/api/middleware/test_faults.py +++ b/manila/tests/api/middleware/test_faults.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/tests/api/openstack/__init__.py b/manila/tests/api/openstack/__init__.py index 9488909d3c..7e86718105 100644 --- a/manila/tests/api/openstack/__init__.py +++ b/manila/tests/api/openstack/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/tests/api/openstack/test_wsgi.py b/manila/tests/api/openstack/test_wsgi.py index 2425c10aeb..60463a67f4 100644 --- a/manila/tests/api/openstack/test_wsgi.py +++ b/manila/tests/api/openstack/test_wsgi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - import inspect import webob diff --git a/manila/tests/api/test_common.py b/manila/tests/api/test_common.py index 925664789d..890e1c87ba 100644 --- a/manila/tests/api/test_common.py +++ b/manila/tests/api/test_common.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/tests/api/test_extensions.py b/manila/tests/api/test_extensions.py index 19fbcca952..97203a8fb4 100644 --- a/manila/tests/api/test_extensions.py +++ b/manila/tests/api/test_extensions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2011 OpenStack LLC. # All Rights Reserved. diff --git a/manila/tests/api/test_wsgi.py b/manila/tests/api/test_wsgi.py index 6afc88bf7f..0a534cdb6e 100644 --- a/manila/tests/api/test_wsgi.py +++ b/manila/tests/api/test_wsgi.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2010 OpenStack LLC. diff --git a/manila/tests/api/test_xmlutil.py b/manila/tests/api/test_xmlutil.py index 271bb1df4c..11eca1496c 100644 --- a/manila/tests/api/test_xmlutil.py +++ b/manila/tests/api/test_xmlutil.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/tests/api/v1/stubs.py b/manila/tests/api/v1/stubs.py index 7701041610..2864087bd7 100644 --- a/manila/tests/api/v1/stubs.py +++ b/manila/tests/api/v1/stubs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/tests/api/v1/test_share_metadata.py b/manila/tests/api/v1/test_share_metadata.py index 28697a2207..21af1b97f9 100644 --- a/manila/tests/api/v1/test_share_metadata.py +++ b/manila/tests/api/v1/test_share_metadata.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/manila/tests/db/__init__.py b/manila/tests/db/__init__.py index 2d43aac42f..fdf33be941 100644 --- a/manila/tests/db/__init__.py +++ b/manila/tests/db/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2010 Citrix Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/manila/tests/db/fakes.py b/manila/tests/db/fakes.py index b5fa1d2190..9173e77dd2 100644 --- a/manila/tests/db/fakes.py +++ b/manila/tests/db/fakes.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 X.commerce, a business unit of eBay Inc. # Copyright 2010 OpenStack, LLC # All Rights Reserved. diff --git a/manila/tests/db/migrations/alembic/test_migration.py b/manila/tests/db/migrations/alembic/test_migration.py index 6630a40825..c631d5b509 100644 --- a/manila/tests/db/migrations/alembic/test_migration.py +++ b/manila/tests/db/migrations/alembic/test_migration.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack, LLC # All Rights Reserved. # diff --git a/manila/tests/declare_conf.py b/manila/tests/declare_conf.py index 46c423929e..5f1e1ceb70 100644 --- a/manila/tests/declare_conf.py +++ b/manila/tests/declare_conf.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/manila/tests/fake_utils.py b/manila/tests/fake_utils.py index ff87845c29..0cba29ad79 100644 --- a/manila/tests/fake_utils.py +++ b/manila/tests/fake_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Citrix Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/manila/tests/integrated/api/__init__.py b/manila/tests/integrated/api/__init__.py index 5798ab3d1e..6168280c24 100644 --- a/manila/tests/integrated/api/__init__.py +++ b/manila/tests/integrated/api/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Justin Santa Barbara # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/manila/tests/integrated/api/client.py b/manila/tests/integrated/api/client.py index 21fc4df018..39e9ee2035 100644 --- a/manila/tests/integrated/api/client.py +++ b/manila/tests/integrated/api/client.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Justin Santa Barbara # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/manila/tests/integrated/integrated_helpers.py b/manila/tests/integrated/integrated_helpers.py index d090e61bbe..4092554659 100644 --- a/manila/tests/integrated/integrated_helpers.py +++ b/manila/tests/integrated/integrated_helpers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Justin Santa Barbara # All Rights Reserved. # diff --git a/manila/tests/integrated/test_extensions.py b/manila/tests/integrated/test_extensions.py index a3c61855ec..4d1772f80d 100644 --- a/manila/tests/integrated/test_extensions.py +++ b/manila/tests/integrated/test_extensions.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Justin Santa Barbara # All Rights Reserved. # diff --git a/manila/tests/integrated/test_login.py b/manila/tests/integrated/test_login.py index c4ad6d3c87..9bf8421c88 100644 --- a/manila/tests/integrated/test_login.py +++ b/manila/tests/integrated/test_login.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Justin Santa Barbara # All Rights Reserved. # diff --git a/manila/tests/monkey_patch_example/__init__.py b/manila/tests/monkey_patch_example/__init__.py index 95f58e7511..f678698a0d 100644 --- a/manila/tests/monkey_patch_example/__init__.py +++ b/manila/tests/monkey_patch_example/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/tests/monkey_patch_example/example_a.py b/manila/tests/monkey_patch_example/example_a.py index 21e79bcb0f..5a1bd7a306 100644 --- a/manila/tests/monkey_patch_example/example_a.py +++ b/manila/tests/monkey_patch_example/example_a.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/tests/monkey_patch_example/example_b.py b/manila/tests/monkey_patch_example/example_b.py index 9d8f6d339e..62adae0a76 100644 --- a/manila/tests/monkey_patch_example/example_b.py +++ b/manila/tests/monkey_patch_example/example_b.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack LLC. # All Rights Reserved. # diff --git a/manila/tests/runtime_conf.py b/manila/tests/runtime_conf.py index 19efe69241..8f486f5504 100644 --- a/manila/tests/runtime_conf.py +++ b/manila/tests/runtime_conf.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/manila/tests/share/drivers/test_glusterfs.py b/manila/tests/share/drivers/test_glusterfs.py index 94c9df3c7a..86ee748c14 100644 --- a/manila/tests/share/drivers/test_glusterfs.py +++ b/manila/tests/share/drivers/test_glusterfs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2014 Red Hat, Inc. # All Rights Reserved. # diff --git a/manila/tests/share/test_driver.py b/manila/tests/share/test_driver.py index 1a505db18b..3b42b1aa09 100644 --- a/manila/tests/share/test_driver.py +++ b/manila/tests/share/test_driver.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2012 NetApp # All Rights Reserved. # diff --git a/manila/tests/test_api.py b/manila/tests/test_api.py index bfdebaecdd..86460a3c1a 100644 --- a/manila/tests/test_api.py +++ b/manila/tests/test_api.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. diff --git a/manila/tests/test_conf.py b/manila/tests/test_conf.py index 52807aa781..fc7807c036 100644 --- a/manila/tests/test_conf.py +++ b/manila/tests/test_conf.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/manila/tests/test_context.py b/manila/tests/test_context.py index 483d4164c9..2738565602 100644 --- a/manila/tests/test_context.py +++ b/manila/tests/test_context.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack LLC # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/manila/tests/test_misc.py b/manila/tests/test_misc.py index ee83d04c95..683b2862ed 100644 --- a/manila/tests/test_misc.py +++ b/manila/tests/test_misc.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack LLC # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/manila/tests/test_test_utils.py b/manila/tests/test_test_utils.py index 7f109c038b..826fdb1ec8 100644 --- a/manila/tests/test_test_utils.py +++ b/manila/tests/test_test_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2010 OpenStack LLC # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/manila/tests/utils.py b/manila/tests/utils.py index b8c71b4554..b2c2faf043 100644 --- a/manila/tests/utils.py +++ b/manila/tests/utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2011 OpenStack LLC # All Rights Reserved. # diff --git a/manila/tests/volume/test_cinder.py b/manila/tests/volume/test_cinder.py index 788e597b8a..bd13acbea0 100644 --- a/manila/tests/volume/test_cinder.py +++ b/manila/tests/volume/test_cinder.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2014 Mirantis, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/manila/tests/windows/basetestcase.py b/manila/tests/windows/basetestcase.py index e0f0e76e80..64a13be4b3 100644 --- a/manila/tests/windows/basetestcase.py +++ b/manila/tests/windows/basetestcase.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Cloudbase Solutions Srl # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/manila/tests/windows/db_fakes.py b/manila/tests/windows/db_fakes.py index a93dbc6f9b..2e801384a9 100644 --- a/manila/tests/windows/db_fakes.py +++ b/manila/tests/windows/db_fakes.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Pedro Navarro Perez # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/manila/tests/windows/mockproxy.py b/manila/tests/windows/mockproxy.py index 53ee9dd4ff..e7fbba095b 100644 --- a/manila/tests/windows/mockproxy.py +++ b/manila/tests/windows/mockproxy.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Cloudbase Solutions Srl # All Rights Reserved. # diff --git a/manila/tests/windows/windowsutils.py b/manila/tests/windows/windowsutils.py index 2038ae372b..df492e1de3 100644 --- a/manila/tests/windows/windowsutils.py +++ b/manila/tests/windows/windowsutils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 Pedro Navarro Perez # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/manila/utils.py b/manila/utils.py index 02c3cc32c9..afdde1b41b 100644 --- a/manila/utils.py +++ b/manila/utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # Copyright 2011 Justin Santa Barbara diff --git a/manila/version.py b/manila/version.py index 75aecef193..be8a7d9773 100644 --- a/manila/version.py +++ b/manila/version.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack LLC # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/manila/volume/__init__.py b/manila/volume/__init__.py index 9837bdfedf..bba8f4c98e 100644 --- a/manila/volume/__init__.py +++ b/manila/volume/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2014 Mirantis Inc. # All Rights Reserved. # diff --git a/manila/volume/cinder.py b/manila/volume/cinder.py index ae2ed4c995..cdd52fcd76 100644 --- a/manila/volume/cinder.py +++ b/manila/volume/cinder.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2014 Mirantis Inc. # All Rights Reserved. # diff --git a/tools/lintstack.py b/tools/lintstack.py index 4162cac760..c2c6a279e7 100755 --- a/tools/lintstack.py +++ b/tools/lintstack.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (c) 2013, AT&T Labs, Yun Mao # All Rights Reserved.