diff --git a/bin/ceilometer-test-event.py b/bin/ceilometer-test-event.py index 99e5e9efa..b5c326276 100755 --- a/bin/ceilometer-test-event.py +++ b/bin/ceilometer-test-event.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Rackspace Hosting. +# Copyright 2013 Rackspace Hosting. # # Author: Monsyne Dragon # diff --git a/ceilometer/agent.py b/ceilometer/agent.py index a407a8bdf..1518b8456 100644 --- a/ceilometer/agent.py +++ b/ceilometer/agent.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Julien Danjou -# Copyright © 2014 Red Hat, Inc +# Copyright 2013 Julien Danjou +# Copyright 2014 Red Hat, Inc # # Authors: Julien Danjou # Eoghan Glynn diff --git a/ceilometer/alarm/evaluator/__init__.py b/ceilometer/alarm/evaluator/__init__.py index 87d67da5d..59cf616e5 100644 --- a/ceilometer/alarm/evaluator/__init__.py +++ b/ceilometer/alarm/evaluator/__init__.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Authors: Mehdi Abaakouk # diff --git a/ceilometer/alarm/evaluator/combination.py b/ceilometer/alarm/evaluator/combination.py index 80ad564c8..994ede045 100644 --- a/ceilometer/alarm/evaluator/combination.py +++ b/ceilometer/alarm/evaluator/combination.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Authors: Mehdi Abaakouk # diff --git a/ceilometer/alarm/evaluator/threshold.py b/ceilometer/alarm/evaluator/threshold.py index af424e6b7..960c7bd41 100644 --- a/ceilometer/alarm/evaluator/threshold.py +++ b/ceilometer/alarm/evaluator/threshold.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Red Hat, Inc +# Copyright 2013 Red Hat, Inc # # Author: Eoghan Glynn # Author: Mehdi Abaakouk diff --git a/ceilometer/alarm/evaluator/utils.py b/ceilometer/alarm/evaluator/utils.py index 544cfcd0a..6de027882 100644 --- a/ceilometer/alarm/evaluator/utils.py +++ b/ceilometer/alarm/evaluator/utils.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2014 Red Hat, Inc +# Copyright 2014 Red Hat, Inc # # Author: Eoghan Glynn # diff --git a/ceilometer/alarm/notifier/__init__.py b/ceilometer/alarm/notifier/__init__.py index 3d252d9e5..7edfc271f 100644 --- a/ceilometer/alarm/notifier/__init__.py +++ b/ceilometer/alarm/notifier/__init__.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/alarm/notifier/log.py b/ceilometer/alarm/notifier/log.py index 2b275f188..f62eb7488 100644 --- a/ceilometer/alarm/notifier/log.py +++ b/ceilometer/alarm/notifier/log.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/alarm/notifier/rest.py b/ceilometer/alarm/notifier/rest.py index 570a1f2fb..6cd345fe6 100644 --- a/ceilometer/alarm/notifier/rest.py +++ b/ceilometer/alarm/notifier/rest.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Mehdi Abaakouk # diff --git a/ceilometer/alarm/notifier/test.py b/ceilometer/alarm/notifier/test.py index 3b233dcb2..6aecd9c89 100644 --- a/ceilometer/alarm/notifier/test.py +++ b/ceilometer/alarm/notifier/test.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/alarm/notifier/trust.py b/ceilometer/alarm/notifier/trust.py index bd19faa8f..d3b01b47c 100644 --- a/ceilometer/alarm/notifier/trust.py +++ b/ceilometer/alarm/notifier/trust.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2014 eNovance +# Copyright 2014 eNovance # # 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 diff --git a/ceilometer/alarm/partition/coordination.py b/ceilometer/alarm/partition/coordination.py index c8d4812f8..828362e9b 100644 --- a/ceilometer/alarm/partition/coordination.py +++ b/ceilometer/alarm/partition/coordination.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Red Hat, Inc +# Copyright 2013 Red Hat, Inc # # Authors: Eoghan Glynn # diff --git a/ceilometer/alarm/rpc.py b/ceilometer/alarm/rpc.py index 515a1b89a..7bd6a0af4 100644 --- a/ceilometer/alarm/rpc.py +++ b/ceilometer/alarm/rpc.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Authors: Mehdi Abaakouk # diff --git a/ceilometer/alarm/service.py b/ceilometer/alarm/service.py index eceabf3af..bceef8034 100644 --- a/ceilometer/alarm/service.py +++ b/ceilometer/alarm/service.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Red Hat, Inc -# Copyright © 2013 eNovance +# Copyright 2013 Red Hat, Inc +# Copyright 2013 eNovance # # Authors: Eoghan Glynn # Julien Danjou diff --git a/ceilometer/api/__init__.py b/ceilometer/api/__init__.py index ec1fe5609..87ef84c04 100644 --- a/ceilometer/api/__init__.py +++ b/ceilometer/api/__init__.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/api/acl.py b/ceilometer/api/acl.py index 3179ef507..b8f6ca71c 100644 --- a/ceilometer/api/acl.py +++ b/ceilometer/api/acl.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/api/app.py b/ceilometer/api/app.py index 7dcb4e4dd..3cd9323ed 100644 --- a/ceilometer/api/app.py +++ b/ceilometer/api/app.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/api/app.wsgi b/ceilometer/api/app.wsgi index 4108e95c2..1fd1469cc 100644 --- a/ceilometer/api/app.wsgi +++ b/ceilometer/api/app.wsgi @@ -1,7 +1,6 @@ # -*- mode: python -*- -# -*- encoding: utf-8 -*- # -# Copyright © 2013 New Dream Network, LLC (DreamHost) +# Copyright 2013 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/api/controllers/root.py b/ceilometer/api/controllers/root.py index b10ea3ab1..dbb990964 100644 --- a/ceilometer/api/controllers/root.py +++ b/ceilometer/api/controllers/root.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/api/controllers/v2.py b/ceilometer/api/controllers/v2.py index dbe870825..84494826d 100644 --- a/ceilometer/api/controllers/v2.py +++ b/ceilometer/api/controllers/v2.py @@ -1,8 +1,7 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # Copyright 2013 IBM Corp. -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # Copyright Ericsson AB 2013. All rights reserved # # Authors: Doug Hellmann diff --git a/ceilometer/api/hooks.py b/ceilometer/api/hooks.py index 757482df4..8974427da 100644 --- a/ceilometer/api/hooks.py +++ b/ceilometer/api/hooks.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # Angus Salkeld diff --git a/ceilometer/api/middleware.py b/ceilometer/api/middleware.py index 193e5e94b..35521db0d 100644 --- a/ceilometer/api/middleware.py +++ b/ceilometer/api/middleware.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # # Copyright 2013 IBM Corp. -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/central/manager.py b/ceilometer/central/manager.py index 91d9a2673..b426aeb14 100644 --- a/ceilometer/central/manager.py +++ b/ceilometer/central/manager.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012-2013 eNovance +# Copyright 2012-2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/central/plugin.py b/ceilometer/central/plugin.py index a7c5595be..afb3c404e 100644 --- a/ceilometer/central/plugin.py +++ b/ceilometer/central/plugin.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/cli.py b/ceilometer/cli.py index b4934d883..4a4ae976c 100644 --- a/ceilometer/cli.py +++ b/ceilometer/cli.py @@ -1,7 +1,7 @@ #!/usr/bin/env python -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- # -# Copyright © 2012-2014 Julien Danjou +# Copyright 2012-2014 Julien Danjou # # Author: Julien Danjou # diff --git a/ceilometer/collector.py b/ceilometer/collector.py index be56fdf6c..9c43028a3 100644 --- a/ceilometer/collector.py +++ b/ceilometer/collector.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012-2013 eNovance +# Copyright 2012-2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/compute/discovery.py b/ceilometer/compute/discovery.py index 393868ae0..17b2f7182 100644 --- a/ceilometer/compute/discovery.py +++ b/ceilometer/compute/discovery.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2014 Red Hat, Inc +# Copyright 2014 Red Hat, Inc # # Author: Eoghan Glynn # diff --git a/ceilometer/compute/manager.py b/ceilometer/compute/manager.py index e7b510e84..bd28bdda2 100644 --- a/ceilometer/compute/manager.py +++ b/ceilometer/compute/manager.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012-2013 eNovance +# Copyright 2012-2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/compute/notifications/__init__.py b/ceilometer/compute/notifications/__init__.py index 6f9b6a082..f526406b4 100644 --- a/ceilometer/compute/notifications/__init__.py +++ b/ceilometer/compute/notifications/__init__.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Intel +# Copyright 2013 Intel # # Author: Shuangtai Tian # diff --git a/ceilometer/compute/notifications/cpu.py b/ceilometer/compute/notifications/cpu.py index fdb52653d..c56372c26 100644 --- a/ceilometer/compute/notifications/cpu.py +++ b/ceilometer/compute/notifications/cpu.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Intel +# Copyright 2013 Intel # # Author: Shuangtai Tian # diff --git a/ceilometer/compute/notifications/instance.py b/ceilometer/compute/notifications/instance.py index f8e600614..68ec172dd 100644 --- a/ceilometer/compute/notifications/instance.py +++ b/ceilometer/compute/notifications/instance.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) -# Copyright © 2013 eNovance +# Copyright 2012 New Dream Network, LLC (DreamHost) +# Copyright 2013 eNovance # # Author: Doug Hellmann # Julien Danjou diff --git a/ceilometer/compute/nova_notifier.py b/ceilometer/compute/nova_notifier.py index 864cd7921..7022fb645 100644 --- a/ceilometer/compute/nova_notifier.py +++ b/ceilometer/compute/nova_notifier.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 New Dream Network, LLC (DreamHost) +# Copyright 2013 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/compute/plugin.py b/ceilometer/compute/plugin.py index 2c4244298..1b16f56ae 100644 --- a/ceilometer/compute/plugin.py +++ b/ceilometer/compute/plugin.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/compute/pollsters/cpu.py b/ceilometer/compute/pollsters/cpu.py index 585542a61..6b7a06acb 100644 --- a/ceilometer/compute/pollsters/cpu.py +++ b/ceilometer/compute/pollsters/cpu.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou # Author: Eoghan Glynn diff --git a/ceilometer/compute/pollsters/disk.py b/ceilometer/compute/pollsters/disk.py index ccc967e78..9f0210f92 100644 --- a/ceilometer/compute/pollsters/disk.py +++ b/ceilometer/compute/pollsters/disk.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou # Author: Eoghan Glynn diff --git a/ceilometer/compute/pollsters/instance.py b/ceilometer/compute/pollsters/instance.py index 6cd3906ef..c19f9df38 100644 --- a/ceilometer/compute/pollsters/instance.py +++ b/ceilometer/compute/pollsters/instance.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou # Author: Eoghan Glynn diff --git a/ceilometer/compute/pollsters/net.py b/ceilometer/compute/pollsters/net.py index cd0ae8125..e1320c3b1 100644 --- a/ceilometer/compute/pollsters/net.py +++ b/ceilometer/compute/pollsters/net.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou # Author: Eoghan Glynn diff --git a/ceilometer/compute/pollsters/util.py b/ceilometer/compute/pollsters/util.py index ed60bf665..5c8fd388f 100644 --- a/ceilometer/compute/pollsters/util.py +++ b/ceilometer/compute/pollsters/util.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou # Author: Eoghan Glynn diff --git a/ceilometer/compute/util.py b/ceilometer/compute/util.py index ba142b45d..fbf214548 100644 --- a/ceilometer/compute/util.py +++ b/ceilometer/compute/util.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2014 Red Hat, Inc +# Copyright 2014 Red Hat, Inc # # Author: Eoghan Glynn # diff --git a/ceilometer/compute/virt/inspector.py b/ceilometer/compute/virt/inspector.py index 0a4af33cd..6736e36c9 100644 --- a/ceilometer/compute/virt/inspector.py +++ b/ceilometer/compute/virt/inspector.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 Red Hat, Inc # # Author: Eoghan Glynn # Doug Hellmann diff --git a/ceilometer/compute/virt/libvirt/inspector.py b/ceilometer/compute/virt/libvirt/inspector.py index 34bc613d2..183324ecb 100644 --- a/ceilometer/compute/virt/libvirt/inspector.py +++ b/ceilometer/compute/virt/libvirt/inspector.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 Red Hat, Inc # # Author: Eoghan Glynn # diff --git a/ceilometer/dispatcher/__init__.py b/ceilometer/dispatcher/__init__.py index ad0eb272b..8b14f2825 100644 --- a/ceilometer/dispatcher/__init__.py +++ b/ceilometer/dispatcher/__init__.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 IBM +# Copyright 2013 IBM # # Author: Tong Li # diff --git a/ceilometer/dispatcher/database.py b/ceilometer/dispatcher/database.py index 9dd37753b..58dbcedf3 100644 --- a/ceilometer/dispatcher/database.py +++ b/ceilometer/dispatcher/database.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Copyright 2013 IBM Corp # diff --git a/ceilometer/dispatcher/file.py b/ceilometer/dispatcher/file.py index 687562b77..2dddf224a 100644 --- a/ceilometer/dispatcher/file.py +++ b/ceilometer/dispatcher/file.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Copyright 2013 IBM Corp # diff --git a/ceilometer/event/converter.py b/ceilometer/event/converter.py index d1772e070..0e21f6350 100644 --- a/ceilometer/event/converter.py +++ b/ceilometer/event/converter.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Rackspace Hosting. +# Copyright 2013 Rackspace Hosting. # # Author: Monsyne Dragon # diff --git a/ceilometer/event/endpoint.py b/ceilometer/event/endpoint.py index fa2187dc2..03e55f74f 100644 --- a/ceilometer/event/endpoint.py +++ b/ceilometer/event/endpoint.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012-2014 eNovance +# Copyright 2012-2014 eNovance # # Author: Mehdi Abaakouk # diff --git a/ceilometer/event/trait_plugins.py b/ceilometer/event/trait_plugins.py index c5fa97ecd..a4e489035 100644 --- a/ceilometer/event/trait_plugins.py +++ b/ceilometer/event/trait_plugins.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Rackspace Hosting. +# Copyright 2013 Rackspace Hosting. # # Author: Monsyne Dragon # diff --git a/ceilometer/hardware/inspector/__init__.py b/ceilometer/hardware/inspector/__init__.py index f3353a306..ee71777c3 100644 --- a/ceilometer/hardware/inspector/__init__.py +++ b/ceilometer/hardware/inspector/__init__.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2014 Intel Corp. +# Copyright 2014 Intel Corp. # # Author: Lianhao Lu # diff --git a/ceilometer/hardware/inspector/base.py b/ceilometer/hardware/inspector/base.py index 0aea0f0de..6803793ae 100644 --- a/ceilometer/hardware/inspector/base.py +++ b/ceilometer/hardware/inspector/base.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2014 ZHAW SoE +# Copyright 2014 ZHAW SoE # # Authors: Lucas Graf # Toni Zehnder diff --git a/ceilometer/hardware/inspector/snmp.py b/ceilometer/hardware/inspector/snmp.py index df88e82ab..a408695a2 100644 --- a/ceilometer/hardware/inspector/snmp.py +++ b/ceilometer/hardware/inspector/snmp.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2014 ZHAW SoE +# Copyright 2014 ZHAW SoE # # Authors: Lucas Graf # Toni Zehnder diff --git a/ceilometer/hardware/plugin.py b/ceilometer/hardware/plugin.py index b62e53b1d..363ffb04f 100644 --- a/ceilometer/hardware/plugin.py +++ b/ceilometer/hardware/plugin.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 ZHAW SoE -# Copyright © 2014 Intel Corp. +# Copyright 2013 ZHAW SoE +# Copyright 2014 Intel Corp. # # Authors: Lucas Graf # Toni Zehnder diff --git a/ceilometer/hardware/pollsters/cpu.py b/ceilometer/hardware/pollsters/cpu.py index 2d3b00c54..0b3a93661 100644 --- a/ceilometer/hardware/pollsters/cpu.py +++ b/ceilometer/hardware/pollsters/cpu.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 ZHAW SoE -# Copyright © 2014 Intel Corp. +# Copyright 2013 ZHAW SoE +# Copyright 2014 Intel Corp. # # Authors: Lucas Graf # Toni Zehnder diff --git a/ceilometer/hardware/pollsters/disk.py b/ceilometer/hardware/pollsters/disk.py index d10bc5811..d43b24a8e 100644 --- a/ceilometer/hardware/pollsters/disk.py +++ b/ceilometer/hardware/pollsters/disk.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 ZHAW SoE -# Copyright © 2014 Intel Corp. +# Copyright 2013 ZHAW SoE +# Copyright 2014 Intel Corp. # # Authors: Lucas Graf # Toni Zehnder diff --git a/ceilometer/hardware/pollsters/memory.py b/ceilometer/hardware/pollsters/memory.py index 3c67adeac..a0fa0dc44 100644 --- a/ceilometer/hardware/pollsters/memory.py +++ b/ceilometer/hardware/pollsters/memory.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 ZHAW SoE -# Copyright © 2014 Intel Corp. +# Copyright 2013 ZHAW SoE +# Copyright 2014 Intel Corp. # # Authors: Lucas Graf # Toni Zehnder diff --git a/ceilometer/hardware/pollsters/net.py b/ceilometer/hardware/pollsters/net.py index 516185124..19490d2d5 100644 --- a/ceilometer/hardware/pollsters/net.py +++ b/ceilometer/hardware/pollsters/net.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 ZHAW SoE -# Copyright © 2014 Intel Corp. +# Copyright 2013 ZHAW SoE +# Copyright 2014 Intel Corp. # # Authors: Lucas Graf # Toni Zehnder diff --git a/ceilometer/hardware/pollsters/util.py b/ceilometer/hardware/pollsters/util.py index 0e2f2e68a..addcab393 100644 --- a/ceilometer/hardware/pollsters/util.py +++ b/ceilometer/hardware/pollsters/util.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 ZHAW SoE -# Copyright © 2014 Intel Corp. +# Copyright 2013 ZHAW SoE +# Copyright 2014 Intel Corp. # # Authors: Lucas Graf # Toni Zehnder diff --git a/ceilometer/image/glance.py b/ceilometer/image/glance.py index 20c3b9a98..7eff933ef 100644 --- a/ceilometer/image/glance.py +++ b/ceilometer/image/glance.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Julien Danjou # diff --git a/ceilometer/image/notifications.py b/ceilometer/image/notifications.py index db7898cc1..ab61b2bbc 100644 --- a/ceilometer/image/notifications.py +++ b/ceilometer/image/notifications.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 Red Hat, Inc # # Author: Eoghan Glynn # diff --git a/ceilometer/messaging.py b/ceilometer/messaging.py index 24f94a7e2..10aba2006 100644 --- a/ceilometer/messaging.py +++ b/ceilometer/messaging.py @@ -1,5 +1,5 @@ -# -*- encoding: utf-8 -*- -# Copyright © 2013 eNovance +# -*- coding: utf-8 -*- +# Copyright 2013 eNovance # # Author: Mehdi Abaakouk # diff --git a/ceilometer/middleware.py b/ceilometer/middleware.py index 3232f684b..9237cae8f 100644 --- a/ceilometer/middleware.py +++ b/ceilometer/middleware.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/network/floatingip.py b/ceilometer/network/floatingip.py index 64ebd44f3..7cd535818 100644 --- a/ceilometer/network/floatingip.py +++ b/ceilometer/network/floatingip.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance +# Copyright 2012 eNovance # # Copyright 2013 IBM Corp # All Rights Reserved. diff --git a/ceilometer/network/notifications.py b/ceilometer/network/notifications.py index 87753f416..a62a2d0b7 100644 --- a/ceilometer/network/notifications.py +++ b/ceilometer/network/notifications.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Julien Danjou # diff --git a/ceilometer/notification.py b/ceilometer/notification.py index 753e685b3..8ddc49db7 100644 --- a/ceilometer/notification.py +++ b/ceilometer/notification.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012-2013 eNovance +# Copyright 2012-2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/notifier.py b/ceilometer/notifier.py index b9b898115..6cbc26c0d 100644 --- a/ceilometer/notifier.py +++ b/ceilometer/notifier.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/nova_client.py b/ceilometer/nova_client.py index b96899c71..092695e83 100644 --- a/ceilometer/nova_client.py +++ b/ceilometer/nova_client.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Author: John Tran # diff --git a/ceilometer/objectstore/swift.py b/ceilometer/objectstore/swift.py index 99a2b1936..8ee568934 100644 --- a/ceilometer/objectstore/swift.py +++ b/ceilometer/objectstore/swift.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance +# Copyright 2012 eNovance # # Author: Guillaume Pernot # diff --git a/ceilometer/objectstore/swift_middleware.py b/ceilometer/objectstore/swift_middleware.py index 75601be97..e99271fa4 100644 --- a/ceilometer/objectstore/swift_middleware.py +++ b/ceilometer/objectstore/swift_middleware.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance +# Copyright 2012 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/pipeline.py b/ceilometer/pipeline.py index f7d2828fc..fc9eeb37b 100644 --- a/ceilometer/pipeline.py +++ b/ceilometer/pipeline.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Intel Corp. -# Copyright © 2014 Red Hat, Inc +# Copyright 2013 Intel Corp. +# Copyright 2014 Red Hat, Inc # # Authors: Yunhong Jiang # Eoghan Glynn diff --git a/ceilometer/plugin.py b/ceilometer/plugin.py index 7e7e4db4b..7ba2862e3 100644 --- a/ceilometer/plugin.py +++ b/ceilometer/plugin.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/publisher/__init__.py b/ceilometer/publisher/__init__.py index 94124747c..a0a7f851d 100644 --- a/ceilometer/publisher/__init__.py +++ b/ceilometer/publisher/__init__.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Intel Corp. -# Copyright © 2013 eNovance +# Copyright 2013 Intel Corp. +# Copyright 2013 eNovance # # Author: Yunhong Jiang # Julien Danjou diff --git a/ceilometer/publisher/file.py b/ceilometer/publisher/file.py index 70f662819..d0edcfa11 100644 --- a/ceilometer/publisher/file.py +++ b/ceilometer/publisher/file.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Copyright 2013 IBM Corp # diff --git a/ceilometer/publisher/rpc.py b/ceilometer/publisher/rpc.py index 922098af2..517580975 100644 --- a/ceilometer/publisher/rpc.py +++ b/ceilometer/publisher/rpc.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/publisher/test.py b/ceilometer/publisher/test.py index 37fbeb47e..8164ec28c 100644 --- a/ceilometer/publisher/test.py +++ b/ceilometer/publisher/test.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/publisher/udp.py b/ceilometer/publisher/udp.py index 39a9a9bac..6baac0740 100644 --- a/ceilometer/publisher/udp.py +++ b/ceilometer/publisher/udp.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou , # Tyaptin Ilya diff --git a/ceilometer/publisher/utils.py b/ceilometer/publisher/utils.py index f938c4329..ef83ef50e 100644 --- a/ceilometer/publisher/utils.py +++ b/ceilometer/publisher/utils.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # Tyaptin Ilya diff --git a/ceilometer/sample.py b/ceilometer/sample.py index 38f751ff3..a9cd607f5 100644 --- a/ceilometer/sample.py +++ b/ceilometer/sample.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) -# Copyright © 2013 eNovance +# Copyright 2012 New Dream Network, LLC (DreamHost) +# Copyright 2013 eNovance # # Authors: Doug Hellmann # Julien Danjou diff --git a/ceilometer/service.py b/ceilometer/service.py index 66df31b40..c1d76f304 100644 --- a/ceilometer/service.py +++ b/ceilometer/service.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -# -*- encoding: utf-8 -*- # -# Copyright © 2012-2014 eNovance +# Copyright 2012-2014 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/storage/__init__.py b/ceilometer/storage/__init__.py index eefa5985b..b83696318 100644 --- a/ceilometer/storage/__init__.py +++ b/ceilometer/storage/__init__.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/storage/base.py b/ceilometer/storage/base.py index 173f58d84..038ed4d72 100644 --- a/ceilometer/storage/base.py +++ b/ceilometer/storage/base.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/storage/impl_db2.py b/ceilometer/storage/impl_db2.py index 26a2cdd25..82745467f 100644 --- a/ceilometer/storage/impl_db2.py +++ b/ceilometer/storage/impl_db2.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- -# Copyright © 2012 New Dream Network, LLC (DreamHost) -# Copyright © 2013 eNovance -# Copyright © 2013 IBM Corp +# Copyright 2012 New Dream Network, LLC (DreamHost) +# Copyright 2013 eNovance +# Copyright 2013 IBM Corp # # Author: Doug Hellmann # Julien Danjou diff --git a/ceilometer/storage/impl_hbase.py b/ceilometer/storage/impl_hbase.py index 4bcdecc70..1e9e5b8bf 100644 --- a/ceilometer/storage/impl_hbase.py +++ b/ceilometer/storage/impl_hbase.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012, 2013 Dell Inc. +# Copyright 2012, 2013 Dell Inc. # # Author: Stas Maksimov # Author: Shengjie Min diff --git a/ceilometer/storage/impl_log.py b/ceilometer/storage/impl_log.py index bce623169..87f655dca 100644 --- a/ceilometer/storage/impl_log.py +++ b/ceilometer/storage/impl_log.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/storage/impl_mongodb.py b/ceilometer/storage/impl_mongodb.py index 13e7eec3d..da1036993 100644 --- a/ceilometer/storage/impl_mongodb.py +++ b/ceilometer/storage/impl_mongodb.py @@ -1,8 +1,7 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) -# Copyright © 2013 eNovance -# Copyright © 2014 Red Hat, Inc +# Copyright 2012 New Dream Network, LLC (DreamHost) +# Copyright 2013 eNovance +# Copyright 2014 Red Hat, Inc # # Authors: Doug Hellmann # Julien Danjou diff --git a/ceilometer/storage/impl_sqlalchemy.py b/ceilometer/storage/impl_sqlalchemy.py index ace023200..a00be8365 100644 --- a/ceilometer/storage/impl_sqlalchemy.py +++ b/ceilometer/storage/impl_sqlalchemy.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Author: John Tran # Julien Danjou diff --git a/ceilometer/storage/models.py b/ceilometer/storage/models.py index b3c79afde..99d3c373c 100644 --- a/ceilometer/storage/models.py +++ b/ceilometer/storage/models.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 New Dream Network, LLC (DreamHost) +# Copyright 2013 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/storage/pymongo_base.py b/ceilometer/storage/pymongo_base.py index cb3bd0abc..35b7a33f9 100644 --- a/ceilometer/storage/pymongo_base.py +++ b/ceilometer/storage/pymongo_base.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Copyright Ericsson AB 2013. All rights reserved # diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/001_add_meter_table.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/001_add_meter_table.py index c476edf83..925288c85 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/001_add_meter_table.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/001_add_meter_table.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Author: John Tran # diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/002_remove_duration.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/002_remove_duration.py index 4b200bacd..9e3f25da5 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/002_remove_duration.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/002_remove_duration.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Author: Julien Danjou # diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/004_add_counter_unit.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/004_add_counter_unit.py index c7b877907..724a1d5ff 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/004_add_counter_unit.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/004_add_counter_unit.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Author: Guillaume Pernot # diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/005_remove_resource_timestamp.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/005_remove_resource_timestamp.py index 2914cfe33..0dd422c30 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/005_remove_resource_timestamp.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/005_remove_resource_timestamp.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/006_counter_volume_is_float.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/006_counter_volume_is_float.py index 4c000bfb2..38bb12b5f 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/006_counter_volume_is_float.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/006_counter_volume_is_float.py @@ -1,6 +1,6 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- # -# Copyright © 2013 eNovance SAS +# Copyright 2013 eNovance SAS # Author: François Charlier # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/007_add_alarm_table.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/007_add_alarm_table.py index 703ade55a..55b06c152 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/007_add_alarm_table.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/007_add_alarm_table.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance -# Copyright © 2013 Red Hat, Inc. +# Copyright 2013 eNovance +# Copyright 2013 Red Hat, Inc. # # Author: Mehdi Abaakouk # Angus Salkeld diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/008_add_events.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/008_add_events.py index 1b1ee879e..f09c19b8e 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/008_add_events.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/008_add_events.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # 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 diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/009_event_strings.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/009_event_strings.py index daee15654..0c37632c5 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/009_event_strings.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/009_event_strings.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # 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 diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/010_add_index_to_meter.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/010_add_index_to_meter.py index 754eee7d6..eae78ad9f 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/010_add_index_to_meter.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/010_add_index_to_meter.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/011_indexes_cleanup.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/011_indexes_cleanup.py index dcf103518..b8149d6a2 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/011_indexes_cleanup.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/011_indexes_cleanup.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/012_add_missing_foreign_keys.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/012_add_missing_foreign_keys.py index cd5272cc0..78c70b4c9 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/012_add_missing_foreign_keys.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/012_add_missing_foreign_keys.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/013_rename_counter_to_meter_alarm.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/013_rename_counter_to_meter_alarm.py index 3db9811bc..8b87e605f 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/013_rename_counter_to_meter_alarm.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/013_rename_counter_to_meter_alarm.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/014_add_event_message_id.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/014_add_event_message_id.py index dd4b76eac..2d2466566 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/014_add_event_message_id.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/014_add_event_message_id.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/015_add_alarm_history_table.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/015_add_alarm_history_table.py index 7223ba070..32af6c216 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/015_add_alarm_history_table.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/015_add_alarm_history_table.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Red Hat, Inc. +# Copyright 2013 Red Hat, Inc. # # Author: Eoghan Glynn # diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/016_simpler_alarm.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/016_simpler_alarm.py index 27dfd7f67..2002bcc6e 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/016_simpler_alarm.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/016_simpler_alarm.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Mehdi Abaakouk # diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/017_convert_timestamp_as_datetime_to_decimal.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/017_convert_timestamp_as_datetime_to_decimal.py index 8c0c3fb51..0c2664478 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/017_convert_timestamp_as_datetime_to_decimal.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/017_convert_timestamp_as_datetime_to_decimal.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Rackspace Hosting +# Copyright 2013 Rackspace Hosting # # Author: Thomas Maddox # diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/018_resource_resource_metadata_is_text.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/018_resource_resource_metadata_is_text.py index 6fa3334a3..fe6065242 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/018_resource_resource_metadata_is_text.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/018_resource_resource_metadata_is_text.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # Copyright 2013 OpenStack Foundation # All Rights Reserved. diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/019_alarm_history_detail_is_text.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/019_alarm_history_detail_is_text.py index ff8698c37..dc877ccbd 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/019_alarm_history_detail_is_text.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/019_alarm_history_detail_is_text.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # Copyright 2013 OpenStack Foundation # All Rights Reserved. diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/021_add_event_types.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/021_add_event_types.py index 887d12d7e..1baae51a9 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/021_add_event_types.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/021_add_event_types.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # 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 diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/022_metadata_int_is_bigint.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/022_metadata_int_is_bigint.py index aaa438f2d..81e031f3a 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/022_metadata_int_is_bigint.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/022_metadata_int_is_bigint.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # Copyright 2013 OpenStack Foundation # All Rights Reserved. diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/023_add_trait_types.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/023_add_trait_types.py index a8f7856c2..1f76f7d4d 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/023_add_trait_types.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/023_add_trait_types.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # 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 diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/024_event_use_floatingprecision.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/024_event_use_floatingprecision.py index d30ec9ef1..837b26808 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/024_event_use_floatingprecision.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/024_event_use_floatingprecision.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance SAS +# Copyright 2013 eNovance SAS # # Author: Mehdi Abaakouk # diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/025_alarm_use_floatingprecision.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/025_alarm_use_floatingprecision.py index 7dc0c43e9..32ca640bf 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/025_alarm_use_floatingprecision.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/025_alarm_use_floatingprecision.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance SAS +# Copyright 2013 eNovance SAS # # Author: Mehdi Abaakouk # diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/026_float_size.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/026_float_size.py index 6c5fa85e7..8f7d3c1c0 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/026_float_size.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/026_float_size.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # 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 diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/027_remove_alarm_fk_constraints.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/027_remove_alarm_fk_constraints.py index fc936653a..78e9947e5 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/027_remove_alarm_fk_constraints.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/027_remove_alarm_fk_constraints.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2014 Intel Crop. +# Copyright 2014 Intel Crop. # # Author: Lianhao Lu # diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/028_alembic_migrations.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/028_alembic_migrations.py index d36ed442b..bce5ad509 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/028_alembic_migrations.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/028_alembic_migrations.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Copyright 2014 OpenStack Foundation # All Rights Reserved. diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/029_sample_recorded_at.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/029_sample_recorded_at.py index 72db7ba7b..ee9f2dc7b 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/029_sample_recorded_at.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/029_sample_recorded_at.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # 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 diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/030_rename_meter_table.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/030_rename_meter_table.py index d19f57522..269bc2fdf 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/030_rename_meter_table.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/030_rename_meter_table.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # 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 diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/032_add_alarm_time_constraints.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/032_add_alarm_time_constraints.py index cbc577ee4..b5e64c1c7 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/032_add_alarm_time_constraints.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/032_add_alarm_time_constraints.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Author: Nejc Saje # diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/033_alarm_id_rename.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/033_alarm_id_rename.py index 4eb795f93..72c6831b3 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/033_alarm_id_rename.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/033_alarm_id_rename.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # 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 diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/034_drop_dump_tables.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/034_drop_dump_tables.py index 9a2a83af1..641c7eff7 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/034_drop_dump_tables.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/034_drop_dump_tables.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # 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 diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/035_drop_user_project_tables.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/035_drop_user_project_tables.py index 373da632e..7b95d7f7d 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/035_drop_user_project_tables.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/035_drop_user_project_tables.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # 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 diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/036_drop_sourceassoc_resource_tables.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/036_drop_sourceassoc_resource_tables.py index 4e112bc01..931b03d6f 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/036_drop_sourceassoc_resource_tables.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/036_drop_sourceassoc_resource_tables.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # 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 diff --git a/ceilometer/storage/sqlalchemy/migration.py b/ceilometer/storage/sqlalchemy/migration.py index 6a2bd6706..1073881be 100644 --- a/ceilometer/storage/sqlalchemy/migration.py +++ b/ceilometer/storage/sqlalchemy/migration.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Author: John Tran # Julien Danjou diff --git a/ceilometer/storage/sqlalchemy/models.py b/ceilometer/storage/sqlalchemy/models.py index 8de15153a..e820d5d36 100644 --- a/ceilometer/storage/sqlalchemy/models.py +++ b/ceilometer/storage/sqlalchemy/models.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Author: John Tran # diff --git a/ceilometer/tests/agentbase.py b/ceilometer/tests/agentbase.py index 3af2d8897..2eec37426 100644 --- a/ceilometer/tests/agentbase.py +++ b/ceilometer/tests/agentbase.py @@ -1,9 +1,8 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) -# Copyright © 2013 Intel corp. -# Copyright © 2013 eNovance -# Copyright © 2014 Red Hat, Inc +# Copyright 2012 New Dream Network, LLC (DreamHost) +# Copyright 2013 Intel corp. +# Copyright 2013 eNovance +# Copyright 2014 Red Hat, Inc # # Authors: Yunhong Jiang # Julien Danjou diff --git a/ceilometer/tests/alarm/evaluator/base.py b/ceilometer/tests/alarm/evaluator/base.py index c16bcf737..e3c28b83c 100644 --- a/ceilometer/tests/alarm/evaluator/base.py +++ b/ceilometer/tests/alarm/evaluator/base.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Mehdi Abaakouk # Eoghan Glynn diff --git a/ceilometer/tests/alarm/evaluator/test_base.py b/ceilometer/tests/alarm/evaluator/test_base.py index c9dc9649d..3a0b62b67 100644 --- a/ceilometer/tests/alarm/evaluator/test_base.py +++ b/ceilometer/tests/alarm/evaluator/test_base.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 IBM Corp +# Copyright 2013 IBM Corp # # Author: Tong Li # diff --git a/ceilometer/tests/alarm/evaluator/test_combination.py b/ceilometer/tests/alarm/evaluator/test_combination.py index 1f623ca56..1189f5a29 100644 --- a/ceilometer/tests/alarm/evaluator/test_combination.py +++ b/ceilometer/tests/alarm/evaluator/test_combination.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Authors: Mehdi Abaakouk # diff --git a/ceilometer/tests/alarm/evaluator/test_threshold.py b/ceilometer/tests/alarm/evaluator/test_threshold.py index 6966232f1..6b8efd143 100644 --- a/ceilometer/tests/alarm/evaluator/test_threshold.py +++ b/ceilometer/tests/alarm/evaluator/test_threshold.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Red Hat, Inc +# Copyright 2013 Red Hat, Inc # # Author: Eoghan Glynn # diff --git a/ceilometer/tests/alarm/partition/test_coordination.py b/ceilometer/tests/alarm/partition/test_coordination.py index 707122ea2..0da005d57 100644 --- a/ceilometer/tests/alarm/partition/test_coordination.py +++ b/ceilometer/tests/alarm/partition/test_coordination.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Red Hat, Inc +# Copyright 2013 Red Hat, Inc # # Author: Eoghan Glynn # diff --git a/ceilometer/tests/alarm/test_notifier.py b/ceilometer/tests/alarm/test_notifier.py index 3e4ba8ac3..4a88b2712 100644 --- a/ceilometer/tests/alarm/test_notifier.py +++ b/ceilometer/tests/alarm/test_notifier.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/tests/alarm/test_partitioned_alarm_svc.py b/ceilometer/tests/alarm/test_partitioned_alarm_svc.py index 2b2769eae..739d49973 100644 --- a/ceilometer/tests/alarm/test_partitioned_alarm_svc.py +++ b/ceilometer/tests/alarm/test_partitioned_alarm_svc.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Red Hat, Inc +# Copyright 2013 Red Hat, Inc # # Author: Eoghan Glynn # diff --git a/ceilometer/tests/alarm/test_rpc.py b/ceilometer/tests/alarm/test_rpc.py index 35b5f33de..55d2def8c 100644 --- a/ceilometer/tests/alarm/test_rpc.py +++ b/ceilometer/tests/alarm/test_rpc.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Authors: Mehdi Abaakouk # diff --git a/ceilometer/tests/alarm/test_singleton_alarm_svc.py b/ceilometer/tests/alarm/test_singleton_alarm_svc.py index 7e3c1aedb..c1353d291 100644 --- a/ceilometer/tests/alarm/test_singleton_alarm_svc.py +++ b/ceilometer/tests/alarm/test_singleton_alarm_svc.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Red Hat, Inc +# Copyright 2013 Red Hat, Inc # # Author: Eoghan Glynn # diff --git a/ceilometer/tests/api/__init__.py b/ceilometer/tests/api/__init__.py index e8cdf70bd..993b48b20 100644 --- a/ceilometer/tests/api/__init__.py +++ b/ceilometer/tests/api/__init__.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/tests/api/v2/__init__.py b/ceilometer/tests/api/v2/__init__.py index 70fc216f4..5d7f1fec0 100644 --- a/ceilometer/tests/api/v2/__init__.py +++ b/ceilometer/tests/api/v2/__init__.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/tests/api/v2/test_acl_scenarios.py b/ceilometer/tests/api/v2/test_acl_scenarios.py index 685b6f24c..03b68b568 100644 --- a/ceilometer/tests/api/v2/test_acl_scenarios.py +++ b/ceilometer/tests/api/v2/test_acl_scenarios.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Julien Danjou # diff --git a/ceilometer/tests/api/v2/test_alarm_scenarios.py b/ceilometer/tests/api/v2/test_alarm_scenarios.py index aa3481edf..5a5ce3a86 100644 --- a/ceilometer/tests/api/v2/test_alarm_scenarios.py +++ b/ceilometer/tests/api/v2/test_alarm_scenarios.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Mehdi Abaakouk # Angus Salkeld diff --git a/ceilometer/tests/api/v2/test_app.py b/ceilometer/tests/api/v2/test_app.py index 5469f4fbb..3a722946f 100644 --- a/ceilometer/tests/api/v2/test_app.py +++ b/ceilometer/tests/api/v2/test_app.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # # Copyright 2013 IBM Corp. -# Copyright © 2013 Julien Danjou +# Copyright 2013 Julien Danjou # # Author: Julien Danjou # diff --git a/ceilometer/tests/api/v2/test_capabilities.py b/ceilometer/tests/api/v2/test_capabilities.py index d8e6338cd..e502bea6c 100644 --- a/ceilometer/tests/api/v2/test_capabilities.py +++ b/ceilometer/tests/api/v2/test_capabilities.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Copyright Ericsson AB 2014. All rights reserved # diff --git a/ceilometer/tests/api/v2/test_complex_query.py b/ceilometer/tests/api/v2/test_complex_query.py index af78178d6..b11e41b40 100644 --- a/ceilometer/tests/api/v2/test_complex_query.py +++ b/ceilometer/tests/api/v2/test_complex_query.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Copyright Ericsson AB 2013. All rights reserved # diff --git a/ceilometer/tests/api/v2/test_complex_query_scenarios.py b/ceilometer/tests/api/v2/test_complex_query_scenarios.py index 8980e0c12..0a46343c9 100644 --- a/ceilometer/tests/api/v2/test_complex_query_scenarios.py +++ b/ceilometer/tests/api/v2/test_complex_query_scenarios.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Copyright Ericsson AB 2013. All rights reserved # diff --git a/ceilometer/tests/api/v2/test_compute_duration_by_resource_scenarios.py b/ceilometer/tests/api/v2/test_compute_duration_by_resource_scenarios.py index 01fa6c340..0a1435d54 100644 --- a/ceilometer/tests/api/v2/test_compute_duration_by_resource_scenarios.py +++ b/ceilometer/tests/api/v2/test_compute_duration_by_resource_scenarios.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/tests/api/v2/test_event_scenarios.py b/ceilometer/tests/api/v2/test_event_scenarios.py index 6dd886444..26ba1d579 100644 --- a/ceilometer/tests/api/v2/test_event_scenarios.py +++ b/ceilometer/tests/api/v2/test_event_scenarios.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Copyright 2013 Hewlett-Packard Development Company, L.P. # diff --git a/ceilometer/tests/api/v2/test_list_events_scenarios.py b/ceilometer/tests/api/v2/test_list_events_scenarios.py index dda220f12..68d0adc87 100644 --- a/ceilometer/tests/api/v2/test_list_events_scenarios.py +++ b/ceilometer/tests/api/v2/test_list_events_scenarios.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/tests/api/v2/test_list_meters_scenarios.py b/ceilometer/tests/api/v2/test_list_meters_scenarios.py index 7a50da103..a30e438a4 100644 --- a/ceilometer/tests/api/v2/test_list_meters_scenarios.py +++ b/ceilometer/tests/api/v2/test_list_meters_scenarios.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Copyright 2012 Red Hat, Inc. # Copyright 2013 IBM Corp. diff --git a/ceilometer/tests/api/v2/test_list_resources_scenarios.py b/ceilometer/tests/api/v2/test_list_resources_scenarios.py index 28037b240..5fc584b0b 100644 --- a/ceilometer/tests/api/v2/test_list_resources_scenarios.py +++ b/ceilometer/tests/api/v2/test_list_resources_scenarios.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/tests/api/v2/test_post_samples_scenarios.py b/ceilometer/tests/api/v2/test_post_samples_scenarios.py index 925fdfcd9..3140cdc3e 100644 --- a/ceilometer/tests/api/v2/test_post_samples_scenarios.py +++ b/ceilometer/tests/api/v2/test_post_samples_scenarios.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Red Hat, Inc +# Copyright 2013 Red Hat, Inc # # Author: Angus Salkeld # diff --git a/ceilometer/tests/api/v2/test_statistics.py b/ceilometer/tests/api/v2/test_statistics.py index 6e82a3b43..0e56f7fa8 100644 --- a/ceilometer/tests/api/v2/test_statistics.py +++ b/ceilometer/tests/api/v2/test_statistics.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/tests/api/v2/test_statistics_scenarios.py b/ceilometer/tests/api/v2/test_statistics_scenarios.py index c2bb2fb2e..05b50918d 100644 --- a/ceilometer/tests/api/v2/test_statistics_scenarios.py +++ b/ceilometer/tests/api/v2/test_statistics_scenarios.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/tests/api/v2/test_wsme_custom_type.py b/ceilometer/tests/api/v2/test_wsme_custom_type.py index 41ee886de..fbd81d186 100644 --- a/ceilometer/tests/api/v2/test_wsme_custom_type.py +++ b/ceilometer/tests/api/v2/test_wsme_custom_type.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Mehdi Abaakouk # diff --git a/ceilometer/tests/base.py b/ceilometer/tests/base.py index 507105351..084a8de77 100644 --- a/ceilometer/tests/base.py +++ b/ceilometer/tests/base.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network (DreamHost) +# Copyright 2012 New Dream Network (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/tests/central/test_manager.py b/ceilometer/tests/central/test_manager.py index 2258ce483..71182ee18 100644 --- a/ceilometer/tests/central/test_manager.py +++ b/ceilometer/tests/central/test_manager.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Intel Corp. +# Copyright 2013 Intel Corp. # # Author: Lianhao Lu # diff --git a/ceilometer/tests/compute/notifications/test_cpu.py b/ceilometer/tests/compute/notifications/test_cpu.py index 0ce3f8a53..300636adb 100644 --- a/ceilometer/tests/compute/notifications/test_cpu.py +++ b/ceilometer/tests/compute/notifications/test_cpu.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Intel +# Copyright 2013 Intel # # Author: Shuangtai Tian # diff --git a/ceilometer/tests/compute/notifications/test_instance.py b/ceilometer/tests/compute/notifications/test_instance.py index 3fce11c19..ee2d7d04f 100644 --- a/ceilometer/tests/compute/notifications/test_instance.py +++ b/ceilometer/tests/compute/notifications/test_instance.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) -# Copyright © 2013 eNovance +# Copyright 2012 New Dream Network, LLC (DreamHost) +# Copyright 2013 eNovance # # Author: Doug Hellmann # Julien Danjou diff --git a/ceilometer/tests/compute/pollsters/base.py b/ceilometer/tests/compute/pollsters/base.py index 02f0459d1..e7ff4b2d2 100644 --- a/ceilometer/tests/compute/pollsters/base.py +++ b/ceilometer/tests/compute/pollsters/base.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou # Author: Eoghan Glynn diff --git a/ceilometer/tests/compute/pollsters/test_cpu.py b/ceilometer/tests/compute/pollsters/test_cpu.py index de4b39dea..8a46381d7 100644 --- a/ceilometer/tests/compute/pollsters/test_cpu.py +++ b/ceilometer/tests/compute/pollsters/test_cpu.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou # Author: Eoghan Glynn diff --git a/ceilometer/tests/compute/pollsters/test_diskio.py b/ceilometer/tests/compute/pollsters/test_diskio.py index b9cf81c98..6226c43fe 100644 --- a/ceilometer/tests/compute/pollsters/test_diskio.py +++ b/ceilometer/tests/compute/pollsters/test_diskio.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou # Author: Eoghan Glynn diff --git a/ceilometer/tests/compute/pollsters/test_instance.py b/ceilometer/tests/compute/pollsters/test_instance.py index 80261b0a7..543643d31 100644 --- a/ceilometer/tests/compute/pollsters/test_instance.py +++ b/ceilometer/tests/compute/pollsters/test_instance.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou # Author: Eoghan Glynn diff --git a/ceilometer/tests/compute/pollsters/test_location_metadata.py b/ceilometer/tests/compute/pollsters/test_location_metadata.py index 638b7148e..083752f29 100644 --- a/ceilometer/tests/compute/pollsters/test_location_metadata.py +++ b/ceilometer/tests/compute/pollsters/test_location_metadata.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou # Author: Eoghan Glynn diff --git a/ceilometer/tests/compute/pollsters/test_net.py b/ceilometer/tests/compute/pollsters/test_net.py index 1eaaa2ab2..44bb58470 100644 --- a/ceilometer/tests/compute/pollsters/test_net.py +++ b/ceilometer/tests/compute/pollsters/test_net.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou # Author: Eoghan Glynn diff --git a/ceilometer/tests/compute/test_manager.py b/ceilometer/tests/compute/test_manager.py index a4bf562fd..1d9685191 100644 --- a/ceilometer/tests/compute/test_manager.py +++ b/ceilometer/tests/compute/test_manager.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/tests/compute/virt/libvirt/test_inspector.py b/ceilometer/tests/compute/virt/libvirt/test_inspector.py index 4b8ee07a0..2d42771b4 100644 --- a/ceilometer/tests/compute/virt/libvirt/test_inspector.py +++ b/ceilometer/tests/compute/virt/libvirt/test_inspector.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -# -*- encoding: utf-8 -*- # -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 Red Hat, Inc # # Author: Eoghan Glynn # diff --git a/ceilometer/tests/db.py b/ceilometer/tests/db.py index 7e1e36ee0..dfdeafeac 100644 --- a/ceilometer/tests/db.py +++ b/ceilometer/tests/db.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) -# Copyright © 2013 eNovance +# Copyright 2012 New Dream Network, LLC (DreamHost) +# Copyright 2013 eNovance # # Author: Doug Hellmann # Julien Danjou diff --git a/ceilometer/tests/dispatcher/test_db.py b/ceilometer/tests/dispatcher/test_db.py index 4aac63507..9fab137c5 100644 --- a/ceilometer/tests/dispatcher/test_db.py +++ b/ceilometer/tests/dispatcher/test_db.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 IBM Corp +# Copyright 2013 IBM Corp # # Author: Tong Li # diff --git a/ceilometer/tests/dispatcher/test_file.py b/ceilometer/tests/dispatcher/test_file.py index e933f2438..2f49d9dc0 100644 --- a/ceilometer/tests/dispatcher/test_file.py +++ b/ceilometer/tests/dispatcher/test_file.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 IBM Corp +# Copyright 2013 IBM Corp # # Author: Tong Li # diff --git a/ceilometer/tests/event/test_converter.py b/ceilometer/tests/event/test_converter.py index a7a1386a8..b48afe37b 100644 --- a/ceilometer/tests/event/test_converter.py +++ b/ceilometer/tests/event/test_converter.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Rackspace Hosting. +# Copyright 2013 Rackspace Hosting. # # Author: Monsyne Dragon # diff --git a/ceilometer/tests/event/test_endpoint.py b/ceilometer/tests/event/test_endpoint.py index 8ef9d5e44..cd1ad84cf 100644 --- a/ceilometer/tests/event/test_endpoint.py +++ b/ceilometer/tests/event/test_endpoint.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/tests/event/test_trait_plugins.py b/ceilometer/tests/event/test_trait_plugins.py index 8197b84b6..8899833b9 100644 --- a/ceilometer/tests/event/test_trait_plugins.py +++ b/ceilometer/tests/event/test_trait_plugins.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Rackspace Hosting. +# Copyright 2013 Rackspace Hosting. # # Author: Monsyne Dragon # diff --git a/ceilometer/tests/hardware/inspector/base.py b/ceilometer/tests/hardware/inspector/base.py index 4981a5135..0c6c88ade 100644 --- a/ceilometer/tests/hardware/inspector/base.py +++ b/ceilometer/tests/hardware/inspector/base.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2014 Intel Corp +# Copyright 2014 Intel Corp # # Authors: Lianhao Lu # diff --git a/ceilometer/tests/hardware/inspector/test_inspector.py b/ceilometer/tests/hardware/inspector/test_inspector.py index 982b5d861..b4bf20f11 100644 --- a/ceilometer/tests/hardware/inspector/test_inspector.py +++ b/ceilometer/tests/hardware/inspector/test_inspector.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2014 Intel Corp +# Copyright 2014 Intel Corp # # Authors: Lianhao Lu # diff --git a/ceilometer/tests/hardware/inspector/test_snmp.py b/ceilometer/tests/hardware/inspector/test_snmp.py index 391913837..393b16f70 100644 --- a/ceilometer/tests/hardware/inspector/test_snmp.py +++ b/ceilometer/tests/hardware/inspector/test_snmp.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Intel Corp +# Copyright 2013 Intel Corp # # Authors: Lianhao Lu # diff --git a/ceilometer/tests/hardware/pollsters/base.py b/ceilometer/tests/hardware/pollsters/base.py index d1412e4c6..966aa7f28 100644 --- a/ceilometer/tests/hardware/pollsters/base.py +++ b/ceilometer/tests/hardware/pollsters/base.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Intel Corp +# Copyright 2013 Intel Corp # # Authors: Lianhao Lu # diff --git a/ceilometer/tests/hardware/pollsters/test_cpu.py b/ceilometer/tests/hardware/pollsters/test_cpu.py index 63aa7184b..c10628234 100644 --- a/ceilometer/tests/hardware/pollsters/test_cpu.py +++ b/ceilometer/tests/hardware/pollsters/test_cpu.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Intel Corp +# Copyright 2013 Intel Corp # # Authors: Lianhao Lu # diff --git a/ceilometer/tests/hardware/pollsters/test_disk.py b/ceilometer/tests/hardware/pollsters/test_disk.py index 7ac747678..55b463231 100644 --- a/ceilometer/tests/hardware/pollsters/test_disk.py +++ b/ceilometer/tests/hardware/pollsters/test_disk.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Intel Corp +# Copyright 2013 Intel Corp # # Authors: Lianhao Lu # diff --git a/ceilometer/tests/hardware/pollsters/test_memory.py b/ceilometer/tests/hardware/pollsters/test_memory.py index 56840e749..2fb4700d7 100644 --- a/ceilometer/tests/hardware/pollsters/test_memory.py +++ b/ceilometer/tests/hardware/pollsters/test_memory.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Intel Corp +# Copyright 2013 Intel Corp # # Authors: Lianhao Lu # diff --git a/ceilometer/tests/hardware/pollsters/test_net.py b/ceilometer/tests/hardware/pollsters/test_net.py index 1928fc68a..770dde7ea 100644 --- a/ceilometer/tests/hardware/pollsters/test_net.py +++ b/ceilometer/tests/hardware/pollsters/test_net.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Intel Corp +# Copyright 2013 Intel Corp # # Authors: Lianhao Lu # diff --git a/ceilometer/tests/image/test_glance.py b/ceilometer/tests/image/test_glance.py index d8a65f257..23b448a43 100644 --- a/ceilometer/tests/image/test_glance.py +++ b/ceilometer/tests/image/test_glance.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Julien Danjou # diff --git a/ceilometer/tests/image/test_notifications.py b/ceilometer/tests/image/test_notifications.py index fb8d895de..5896fba0e 100644 --- a/ceilometer/tests/image/test_notifications.py +++ b/ceilometer/tests/image/test_notifications.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 Red Hat Inc. +# Copyright 2012 Red Hat Inc. # # Author: Eoghan Glynn # Author: Julien danjou diff --git a/ceilometer/tests/network/test_floatingip.py b/ceilometer/tests/network/test_floatingip.py index 254d088d9..9e0987126 100644 --- a/ceilometer/tests/network/test_floatingip.py +++ b/ceilometer/tests/network/test_floatingip.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance +# Copyright 2012 eNovance # # Copyright 2013 IBM Corp # All Rights Reserved. diff --git a/ceilometer/tests/network/test_notifications.py b/ceilometer/tests/network/test_notifications.py index 5cab884fe..c60a5be48 100644 --- a/ceilometer/tests/network/test_notifications.py +++ b/ceilometer/tests/network/test_notifications.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Julien Danjou # diff --git a/ceilometer/tests/objectstore/test_swift.py b/ceilometer/tests/objectstore/test_swift.py index 3a8472128..f66fed9a3 100644 --- a/ceilometer/tests/objectstore/test_swift.py +++ b/ceilometer/tests/objectstore/test_swift.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance +# Copyright 2012 eNovance # # Author: Guillaume Pernot # diff --git a/ceilometer/tests/objectstore/test_swift_middleware.py b/ceilometer/tests/objectstore/test_swift_middleware.py index d3ac36b25..fd8f80f82 100644 --- a/ceilometer/tests/objectstore/test_swift_middleware.py +++ b/ceilometer/tests/objectstore/test_swift_middleware.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance +# Copyright 2012 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/tests/pipeline_base.py b/ceilometer/tests/pipeline_base.py index f4f5a6483..831c1838e 100644 --- a/ceilometer/tests/pipeline_base.py +++ b/ceilometer/tests/pipeline_base.py @@ -1,6 +1,6 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- # -# Copyright © 2013 Intel Corp. +# Copyright 2013 Intel Corp. # # Authors: Yunhong Jiang # Julien Danjou diff --git a/ceilometer/tests/publisher/test_file.py b/ceilometer/tests/publisher/test_file.py index 9715271c1..74625749b 100644 --- a/ceilometer/tests/publisher/test_file.py +++ b/ceilometer/tests/publisher/test_file.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/tests/publisher/test_rpc_publisher.py b/ceilometer/tests/publisher/test_rpc_publisher.py index 6afc239f0..3f910a601 100644 --- a/ceilometer/tests/publisher/test_rpc_publisher.py +++ b/ceilometer/tests/publisher/test_rpc_publisher.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # Julien Danjou diff --git a/ceilometer/tests/publisher/test_udp.py b/ceilometer/tests/publisher/test_udp.py index b6cc52c8e..1a49b53e8 100644 --- a/ceilometer/tests/publisher/test_udp.py +++ b/ceilometer/tests/publisher/test_udp.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/tests/publisher/test_utils.py b/ceilometer/tests/publisher/test_utils.py index 457185771..ab9564bf1 100644 --- a/ceilometer/tests/publisher/test_utils.py +++ b/ceilometer/tests/publisher/test_utils.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # Julien Danjou diff --git a/ceilometer/tests/storage/sqlalchemy/test_models.py b/ceilometer/tests/storage/sqlalchemy/test_models.py index 0a542b1cc..17b5b7f97 100644 --- a/ceilometer/tests/storage/sqlalchemy/test_models.py +++ b/ceilometer/tests/storage/sqlalchemy/test_models.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Rackspace Hosting +# Copyright 2013 Rackspace Hosting # # Author: Thomas Maddox # diff --git a/ceilometer/tests/storage/test_base.py b/ceilometer/tests/storage/test_base.py index b34479dd6..2410f2e4e 100644 --- a/ceilometer/tests/storage/test_base.py +++ b/ceilometer/tests/storage/test_base.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/tests/storage/test_get_connection.py b/ceilometer/tests/storage/test_get_connection.py index 7cd4bde67..c74178f59 100644 --- a/ceilometer/tests/storage/test_get_connection.py +++ b/ceilometer/tests/storage/test_get_connection.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/tests/storage/test_impl_db2.py b/ceilometer/tests/storage/test_impl_db2.py index f15a7692a..c05fe97a9 100644 --- a/ceilometer/tests/storage/test_impl_db2.py +++ b/ceilometer/tests/storage/test_impl_db2.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Copyright Ericsson AB 2014. All rights reserved # diff --git a/ceilometer/tests/storage/test_impl_hbase.py b/ceilometer/tests/storage/test_impl_hbase.py index 35aba93e9..805b19cbd 100644 --- a/ceilometer/tests/storage/test_impl_hbase.py +++ b/ceilometer/tests/storage/test_impl_hbase.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012, 2013 Dell Inc. +# Copyright 2012, 2013 Dell Inc. # # Author: Stas Maksimov # Author: Shengjie Min diff --git a/ceilometer/tests/storage/test_impl_log.py b/ceilometer/tests/storage/test_impl_log.py index 10062c878..602956c14 100644 --- a/ceilometer/tests/storage/test_impl_log.py +++ b/ceilometer/tests/storage/test_impl_log.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/tests/storage/test_impl_mongodb.py b/ceilometer/tests/storage/test_impl_mongodb.py index a9e6ddc8e..c1995537d 100644 --- a/ceilometer/tests/storage/test_impl_mongodb.py +++ b/ceilometer/tests/storage/test_impl_mongodb.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/tests/storage/test_impl_sqlalchemy.py b/ceilometer/tests/storage/test_impl_sqlalchemy.py index edf1dcc4e..28512db9b 100644 --- a/ceilometer/tests/storage/test_impl_sqlalchemy.py +++ b/ceilometer/tests/storage/test_impl_sqlalchemy.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Author: John Tran # Julien Danjou diff --git a/ceilometer/tests/storage/test_models.py b/ceilometer/tests/storage/test_models.py index c12179400..be20c7341 100644 --- a/ceilometer/tests/storage/test_models.py +++ b/ceilometer/tests/storage/test_models.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 New Dream Network, LLC (DreamHost) +# Copyright 2013 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/tests/storage/test_pymongo_base.py b/ceilometer/tests/storage/test_pymongo_base.py index 0a152416e..71bdb6351 100644 --- a/ceilometer/tests/storage/test_pymongo_base.py +++ b/ceilometer/tests/storage/test_pymongo_base.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # 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/ceilometer/tests/storage/test_storage_scenarios.py b/ceilometer/tests/storage/test_storage_scenarios.py index 27b0c3f9f..b62398cc1 100644 --- a/ceilometer/tests/storage/test_storage_scenarios.py +++ b/ceilometer/tests/storage/test_storage_scenarios.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Intel Corp. +# Copyright 2013 Intel Corp. # # Author: Lianhao Lu # Shane Wang diff --git a/ceilometer/tests/test_bin.py b/ceilometer/tests/test_bin.py index d4dc4a8b9..2f4789bbd 100644 --- a/ceilometer/tests/test_bin.py +++ b/ceilometer/tests/test_bin.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance +# Copyright 2012 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/tests/test_collector.py b/ceilometer/tests/test_collector.py index 436c9b008..3b08aaf5e 100644 --- a/ceilometer/tests/test_collector.py +++ b/ceilometer/tests/test_collector.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/tests/test_decoupled_pipeline.py b/ceilometer/tests/test_decoupled_pipeline.py index 293adb32f..02e44e895 100644 --- a/ceilometer/tests/test_decoupled_pipeline.py +++ b/ceilometer/tests/test_decoupled_pipeline.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2014 Red Hat, Inc +# Copyright 2014 Red Hat, Inc # # Author: Eoghan Glynn # diff --git a/ceilometer/tests/test_deprecated_pipeline.py b/ceilometer/tests/test_deprecated_pipeline.py index 606dcadef..7930e3eda 100644 --- a/ceilometer/tests/test_deprecated_pipeline.py +++ b/ceilometer/tests/test_deprecated_pipeline.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2014 Red Hat, Inc +# Copyright 2014 Red Hat, Inc # # Author: Eoghan Glynn # diff --git a/ceilometer/tests/test_middleware.py b/ceilometer/tests/test_middleware.py index 196943db7..10d6e4bfa 100644 --- a/ceilometer/tests/test_middleware.py +++ b/ceilometer/tests/test_middleware.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/tests/test_notification.py b/ceilometer/tests/test_notification.py index 4d7d8a88a..0601e6dda 100644 --- a/ceilometer/tests/test_notification.py +++ b/ceilometer/tests/test_notification.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/ceilometer/tests/test_notifier.py b/ceilometer/tests/test_notifier.py index 4d093fa7a..1b3ece2de 100644 --- a/ceilometer/tests/test_notifier.py +++ b/ceilometer/tests/test_notifier.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/tests/test_novaclient.py b/ceilometer/tests/test_novaclient.py index 742ab6b12..7733921bd 100644 --- a/ceilometer/tests/test_novaclient.py +++ b/ceilometer/tests/test_novaclient.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/tests/test_plugin.py b/ceilometer/tests/test_plugin.py index 344c27123..3f06ccad7 100644 --- a/ceilometer/tests/test_plugin.py +++ b/ceilometer/tests/test_plugin.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou # diff --git a/ceilometer/tests/test_utils.py b/ceilometer/tests/test_utils.py index d847016bc..9576a65e5 100644 --- a/ceilometer/tests/test_utils.py +++ b/ceilometer/tests/test_utils.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # Copyright (c) 2013 OpenStack Foundation # # Author: Doug Hellmann diff --git a/ceilometer/transformer/__init__.py b/ceilometer/transformer/__init__.py index 0f9b0db76..4dcb2ad73 100644 --- a/ceilometer/transformer/__init__.py +++ b/ceilometer/transformer/__init__.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Intel Corp. +# Copyright 2013 Intel Corp. # # Author: Yunhong Jiang # diff --git a/ceilometer/transformer/accumulator.py b/ceilometer/transformer/accumulator.py index 2b7bf0162..0f858c50f 100644 --- a/ceilometer/transformer/accumulator.py +++ b/ceilometer/transformer/accumulator.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Julien Danjou +# Copyright 2013 Julien Danjou # # Author: Julien Danjou # diff --git a/ceilometer/transformer/conversions.py b/ceilometer/transformer/conversions.py index 44f563b64..3abc30cc3 100644 --- a/ceilometer/transformer/conversions.py +++ b/ceilometer/transformer/conversions.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Red Hat, Inc +# Copyright 2013 Red Hat, Inc # # Author: Eoghan Glynn # diff --git a/ceilometer/volume/notifications.py b/ceilometer/volume/notifications.py index 2a0fdfeec..927368529 100644 --- a/ceilometer/volume/notifications.py +++ b/ceilometer/volume/notifications.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Julien Danjou # diff --git a/doc/source/conf.py b/doc/source/conf.py index 9b16f6809..895be3a6e 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # Ceilometer documentation build configuration file, created by # sphinx-quickstart on Thu Oct 27 11:38:59 2011. diff --git a/nova_tests/__init__.py b/nova_tests/__init__.py index bf5b8dbb7..1db4852e9 100644 --- a/nova_tests/__init__.py +++ b/nova_tests/__init__.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Intel Corp. +# Copyright 2013 Intel Corp. # # Author: Lianhao Lu # diff --git a/nova_tests/test_notifier.py b/nova_tests/test_notifier.py index 6adec5408..3cfeebac8 100644 --- a/nova_tests/test_notifier.py +++ b/nova_tests/test_notifier.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Julien Danjou # Doug Hellmann diff --git a/tools/make_test_data.py b/tools/make_test_data.py index 95c37cf74..4d2f3d818 100755 --- a/tools/make_test_data.py +++ b/tools/make_test_data.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann # diff --git a/tools/release-bugs.py b/tools/release-bugs.py index ee3ca9b64..2314c8138 100755 --- a/tools/release-bugs.py +++ b/tools/release-bugs.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -# -*- encoding: utf-8 -*- # -# Copyright © 2012 Graham Binns for Canonical +# Copyright 2012 Graham Binns for Canonical # # Author: Graham Binns # diff --git a/tools/show_data.py b/tools/show_data.py index d5c48003f..061425931 100755 --- a/tools/show_data.py +++ b/tools/show_data.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network (DreamHost) +# Copyright 2012 New Dream Network (DreamHost) # # Author: Doug Hellmann #