diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-06-10 10:14:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-06-10 10:14:34 +0000 |
| commit | 2ce64d4c9715c4d5a1c63f8deafc895d287dff65 (patch) | |
| tree | 1cc8f05656e1bcb5228169c29def9a539304dfd5 | |
| parent | 3d2723ed7d09724e743869d9ba7b9b37692ed340 (diff) | |
| parent | d7054053ae1f0dad276279bdf66c622842fec1be (diff) | |
| download | ceilometer-2ce64d4c9715c4d5a1c63f8deafc895d287dff65.tar.gz | |
Merge "Remove (c) and remove unnecessary encoding lines"
216 files changed, 214 insertions, 426 deletions
diff --git a/bin/ceilometer-test-event.py b/bin/ceilometer-test-event.py index 99e5e9ef..b5c32627 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 <mdragon@rackspace.com> # diff --git a/ceilometer/agent.py b/ceilometer/agent.py index a407a8bd..1518b845 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 <julien@danjou.info> # Eoghan Glynn <eglynn@redhat.com> diff --git a/ceilometer/alarm/evaluator/__init__.py b/ceilometer/alarm/evaluator/__init__.py index 87d67da5..59cf616e 100644 --- a/ceilometer/alarm/evaluator/__init__.py +++ b/ceilometer/alarm/evaluator/__init__.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance <licensing@enovance.com> +# Copyright 2013 eNovance <licensing@enovance.com> # # Authors: Mehdi Abaakouk <mehdi.abaakouk@enovance.com> # diff --git a/ceilometer/alarm/evaluator/combination.py b/ceilometer/alarm/evaluator/combination.py index 80ad564c..994ede04 100644 --- a/ceilometer/alarm/evaluator/combination.py +++ b/ceilometer/alarm/evaluator/combination.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance <licensing@enovance.com> +# Copyright 2013 eNovance <licensing@enovance.com> # # Authors: Mehdi Abaakouk <mehdi.abaakouk@enovance.com> # diff --git a/ceilometer/alarm/evaluator/threshold.py b/ceilometer/alarm/evaluator/threshold.py index af424e6b..960c7bd4 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 <eglynn@redhat.com> # Author: Mehdi Abaakouk <mehdi.abaakouk@enovance.com> diff --git a/ceilometer/alarm/evaluator/utils.py b/ceilometer/alarm/evaluator/utils.py index 544cfcd0..6de02788 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 <eglynn@redhat.com> # diff --git a/ceilometer/alarm/notifier/__init__.py b/ceilometer/alarm/notifier/__init__.py index 3d252d9e..7edfc271 100644 --- a/ceilometer/alarm/notifier/__init__.py +++ b/ceilometer/alarm/notifier/__init__.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance <licensing@enovance.com> +# Copyright 2013 eNovance <licensing@enovance.com> # # Author: Julien Danjou <julien@danjou.info> # diff --git a/ceilometer/alarm/notifier/log.py b/ceilometer/alarm/notifier/log.py index 2b275f18..f62eb748 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 <julien@danjou.info> # diff --git a/ceilometer/alarm/notifier/rest.py b/ceilometer/alarm/notifier/rest.py index 570a1f2f..6cd345fe 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 <mehdi.abaakouk@enovance.com> # diff --git a/ceilometer/alarm/notifier/test.py b/ceilometer/alarm/notifier/test.py index 3b233dcb..6aecd9c8 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 <julien@danjou.info> # diff --git a/ceilometer/alarm/notifier/trust.py b/ceilometer/alarm/notifier/trust.py index bd19faa8..d3b01b47 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 c8d4812f..828362e9 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 <eglynn@redhat.com> # diff --git a/ceilometer/alarm/rpc.py b/ceilometer/alarm/rpc.py index 0c56e8eb..4e177d0e 100644 --- a/ceilometer/alarm/rpc.py +++ b/ceilometer/alarm/rpc.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance <licensing@enovance.com> +# Copyright 2013 eNovance <licensing@enovance.com> # # Authors: Mehdi Abaakouk <mehdi.abaakouk@enovance.com> # diff --git a/ceilometer/alarm/service.py b/ceilometer/alarm/service.py index eceabf3a..bceef803 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 <licensing@enovance.com> +# Copyright 2013 Red Hat, Inc +# Copyright 2013 eNovance <licensing@enovance.com> # # Authors: Eoghan Glynn <eglynn@redhat.com> # Julien Danjou <julien@danjou.info> diff --git a/ceilometer/api/__init__.py b/ceilometer/api/__init__.py index ec1fe560..87ef84c0 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/api/acl.py b/ceilometer/api/acl.py index 3179ef50..b8f6ca71 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/api/app.py b/ceilometer/api/app.py index 7dcb4e4d..3cd9323e 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/api/app.wsgi b/ceilometer/api/app.wsgi index 4108e95c..1fd1469c 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/api/controllers/root.py b/ceilometer/api/controllers/root.py index b10ea3ab..dbb99096 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/api/controllers/v2.py b/ceilometer/api/controllers/v2.py index fd66608c..4083edd8 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 <licensing@enovance.com> +# Copyright 2013 eNovance <licensing@enovance.com> # Copyright Ericsson AB 2013. All rights reserved # # Authors: Doug Hellmann <doug.hellmann@dreamhost.com> diff --git a/ceilometer/api/hooks.py b/ceilometer/api/hooks.py index 757482df..8974427d 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 <doug.hellmann@dreamhost.com> # Angus Salkeld <asalkeld@redhat.com> diff --git a/ceilometer/api/middleware.py b/ceilometer/api/middleware.py index 193e5e94..35521db0 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/central/manager.py b/ceilometer/central/manager.py index 91d9a267..b426aeb1 100644 --- a/ceilometer/central/manager.py +++ b/ceilometer/central/manager.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012-2013 eNovance <licensing@enovance.com> +# Copyright 2012-2013 eNovance <licensing@enovance.com> # # Author: Julien Danjou <julien@danjou.info> # diff --git a/ceilometer/central/plugin.py b/ceilometer/central/plugin.py index a7c5595b..afb3c404 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/cli.py b/ceilometer/cli.py index b4934d88..4a4ae976 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 <julien@danjou.info> # diff --git a/ceilometer/collector.py b/ceilometer/collector.py index 3a15eead..f9c08ee7 100644 --- a/ceilometer/collector.py +++ b/ceilometer/collector.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012-2013 eNovance <licensing@enovance.com> +# Copyright 2012-2013 eNovance <licensing@enovance.com> # # Author: Julien Danjou <julien@danjou.info> # diff --git a/ceilometer/compute/discovery.py b/ceilometer/compute/discovery.py index 393868ae..17b2f718 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 <eglynn@redhat.com> # diff --git a/ceilometer/compute/manager.py b/ceilometer/compute/manager.py index e7b510e8..bd28bdda 100644 --- a/ceilometer/compute/manager.py +++ b/ceilometer/compute/manager.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012-2013 eNovance <licensing@enovance.com> +# Copyright 2012-2013 eNovance <licensing@enovance.com> # # Author: Julien Danjou <julien@danjou.info> # diff --git a/ceilometer/compute/notifications/__init__.py b/ceilometer/compute/notifications/__init__.py index 6f9b6a08..f526406b 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 <shuangtai.tian@intel.com> # diff --git a/ceilometer/compute/notifications/cpu.py b/ceilometer/compute/notifications/cpu.py index fdb52653..c56372c2 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 <shuangtai.tian@intel.com> # diff --git a/ceilometer/compute/notifications/instance.py b/ceilometer/compute/notifications/instance.py index f8e60061..68ec172d 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 <doug.hellmann@dreamhost.com> # Julien Danjou <julien@danjou.info> diff --git a/ceilometer/compute/nova_notifier.py b/ceilometer/compute/nova_notifier.py index 864cd792..7022fb64 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/compute/plugin.py b/ceilometer/compute/plugin.py index 2c424429..1b16f56a 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/compute/pollsters/cpu.py b/ceilometer/compute/pollsters/cpu.py index 585542a6..6b7a06ac 100644 --- a/ceilometer/compute/pollsters/cpu.py +++ b/ceilometer/compute/pollsters/cpu.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance <licensing@enovance.com> -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance <licensing@enovance.com> +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou <julien@danjou.info> # Author: Eoghan Glynn <eglynn@redhat.com> diff --git a/ceilometer/compute/pollsters/disk.py b/ceilometer/compute/pollsters/disk.py index ccc967e7..9f0210f9 100644 --- a/ceilometer/compute/pollsters/disk.py +++ b/ceilometer/compute/pollsters/disk.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance <licensing@enovance.com> -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance <licensing@enovance.com> +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou <julien@danjou.info> # Author: Eoghan Glynn <eglynn@redhat.com> diff --git a/ceilometer/compute/pollsters/instance.py b/ceilometer/compute/pollsters/instance.py index 6cd3906e..c19f9df3 100644 --- a/ceilometer/compute/pollsters/instance.py +++ b/ceilometer/compute/pollsters/instance.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance <licensing@enovance.com> -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance <licensing@enovance.com> +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou <julien@danjou.info> # Author: Eoghan Glynn <eglynn@redhat.com> diff --git a/ceilometer/compute/pollsters/net.py b/ceilometer/compute/pollsters/net.py index cd0ae812..e1320c3b 100644 --- a/ceilometer/compute/pollsters/net.py +++ b/ceilometer/compute/pollsters/net.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance <licensing@enovance.com> -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance <licensing@enovance.com> +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou <julien@danjou.info> # Author: Eoghan Glynn <eglynn@redhat.com> diff --git a/ceilometer/compute/pollsters/util.py b/ceilometer/compute/pollsters/util.py index ed60bf66..5c8fd388 100644 --- a/ceilometer/compute/pollsters/util.py +++ b/ceilometer/compute/pollsters/util.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance <licensing@enovance.com> -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance <licensing@enovance.com> +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou <julien@danjou.info> # Author: Eoghan Glynn <eglynn@redhat.com> diff --git a/ceilometer/compute/util.py b/ceilometer/compute/util.py index ba142b45..fbf21454 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 <eglynn@redhat.com> # diff --git a/ceilometer/compute/virt/inspector.py b/ceilometer/compute/virt/inspector.py index 0a4af33c..6736e36c 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 <eglynn@redhat.com> # Doug Hellmann <doug.hellmann@dreamhost.com> diff --git a/ceilometer/compute/virt/libvirt/inspector.py b/ceilometer/compute/virt/libvirt/inspector.py index 56f5a8d3..16fb6bfb 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 <eglynn@redhat.com> # diff --git a/ceilometer/dispatcher/__init__.py b/ceilometer/dispatcher/__init__.py index ad0eb272..8b14f282 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 <litong01@us.ibm.com> # diff --git a/ceilometer/dispatcher/database.py b/ceilometer/dispatcher/database.py index 9dd37753..58dbcedf 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 687562b7..2dddf224 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 d1772e07..0e21f635 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 <mdragon@rackspace.com> # diff --git a/ceilometer/event/endpoint.py b/ceilometer/event/endpoint.py index 659d6449..fa05c8a1 100644 --- a/ceilometer/event/endpoint.py +++ b/ceilometer/event/endpoint.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012-2014 eNovance <licensing@enovance.com> +# Copyright 2012-2014 eNovance <licensing@enovance.com> # # Author: Mehdi Abaakouk <mehdi.abaakouk@enovance.com> # diff --git a/ceilometer/event/trait_plugins.py b/ceilometer/event/trait_plugins.py index c5fa97ec..a4e48903 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 <mdragon@rackspace.com> # diff --git a/ceilometer/hardware/inspector/__init__.py b/ceilometer/hardware/inspector/__init__.py index f3353a30..ee71777c 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 <yunhong.jiang@intel.com> # diff --git a/ceilometer/hardware/inspector/base.py b/ceilometer/hardware/inspector/base.py index 0aea0f0d..6803793a 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 <graflu0@students.zhaw.ch> # Toni Zehnder <zehndton@students.zhaw.ch> diff --git a/ceilometer/hardware/inspector/snmp.py b/ceilometer/hardware/inspector/snmp.py index df88e82a..a408695a 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 <graflu0@students.zhaw.ch> # Toni Zehnder <zehndton@students.zhaw.ch> diff --git a/ceilometer/hardware/plugin.py b/ceilometer/hardware/plugin.py index b62e53b1..363ffb04 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 <graflu0@students.zhaw.ch> # Toni Zehnder <zehndton@students.zhaw.ch> diff --git a/ceilometer/hardware/pollsters/cpu.py b/ceilometer/hardware/pollsters/cpu.py index 2d3b00c5..0b3a9366 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 <graflu0@students.zhaw.ch> # Toni Zehnder <zehndton@students.zhaw.ch> diff --git a/ceilometer/hardware/pollsters/disk.py b/ceilometer/hardware/pollsters/disk.py index d10bc581..d43b24a8 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 <graflu0@students.zhaw.ch> # Toni Zehnder <zehndton@students.zhaw.ch> diff --git a/ceilometer/hardware/pollsters/memory.py b/ceilometer/hardware/pollsters/memory.py index 3c67adea..a0fa0dc4 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 <graflu0@students.zhaw.ch> # Toni Zehnder <zehndton@students.zhaw.ch> diff --git a/ceilometer/hardware/pollsters/net.py b/ceilometer/hardware/pollsters/net.py index 51618512..19490d2d 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 <graflu0@students.zhaw.ch> # Toni Zehnder <zehndton@students.zhaw.ch> diff --git a/ceilometer/hardware/pollsters/util.py b/ceilometer/hardware/pollsters/util.py index 0e2f2e68..addcab39 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 <graflu0@students.zhaw.ch> # Toni Zehnder <zehndton@students.zhaw.ch> diff --git a/ceilometer/image/glance.py b/ceilometer/image/glance.py index 20c3b9a9..7eff933e 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 <julien@danjou.info> # diff --git a/ceilometer/image/notifications.py b/ceilometer/image/notifications.py index db7898cc..ab61b2bb 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 <eglynn@redhat.com> # diff --git a/ceilometer/messaging.py b/ceilometer/messaging.py index 7d92e03d..88934606 100644 --- a/ceilometer/messaging.py +++ b/ceilometer/messaging.py @@ -1,5 +1,5 @@ -# -*- encoding: utf-8 -*- -# Copyright © 2013 eNovance <licensing@enovance.com> +# -*- coding: utf-8 -*- +# Copyright 2013 eNovance <licensing@enovance.com> # # Author: Mehdi Abaakouk <mehdi.abaakouk@enovance.com> # diff --git a/ceilometer/middleware.py b/ceilometer/middleware.py index 3232f684..9237cae8 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 <julien@danjou.info> # diff --git a/ceilometer/network/floatingip.py b/ceilometer/network/floatingip.py index 64ebd44f..7cd53581 100644 --- a/ceilometer/network/floatingip.py +++ b/ceilometer/network/floatingip.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 eNovance <licensing@enovance.com> +# Copyright 2012 eNovance <licensing@enovance.com> # # Copyright 2013 IBM Corp # All Rights Reserved. diff --git a/ceilometer/network/notifications.py b/ceilometer/network/notifications.py index 87753f41..a62a2d0b 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 <julien@danjou.info> # diff --git a/ceilometer/notification.py b/ceilometer/notification.py index 753e685b..8ddc49db 100644 --- a/ceilometer/notification.py +++ b/ceilometer/notification.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012-2013 eNovance <licensing@enovance.com> +# Copyright 2012-2013 eNovance <licensing@enovance.com> # # Author: Julien Danjou <julien@danjou.info> # diff --git a/ceilometer/notifier.py b/ceilometer/notifier.py index b9b89811..6cbc26c0 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 <julien@danjou.info> # diff --git a/ceilometer/nova_client.py b/ceilometer/nova_client.py index 2df27aa8..83595024 100644 --- a/ceilometer/nova_client.py +++ b/ceilometer/nova_client.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Author: John Tran <jhtran@att.com> # diff --git a/ceilometer/objectstore/swift.py b/ceilometer/objectstore/swift.py index 99a2b193..8ee56893 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 <gpernot@praksys.org> # diff --git a/ceilometer/objectstore/swift_middleware.py b/ceilometer/objectstore/swift_middleware.py index 75601be9..e99271fa 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 <licensing@enovance.com> +# Copyright 2012 eNovance <licensing@enovance.com> # # Author: Julien Danjou <julien@danjou.info> # diff --git a/ceilometer/pipeline.py b/ceilometer/pipeline.py index f7d2828f..fc9eeb37 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 <yunhong.jiang@intel.com> # Eoghan Glynn <eglynn@redhat.com> diff --git a/ceilometer/plugin.py b/ceilometer/plugin.py index 7e7e4db4..7ba2862e 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/publisher/__init__.py b/ceilometer/publisher/__init__.py index 94124747..a0a7f851 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 <yunhong.jiang@intel.com> # Julien Danjou <julien@danjou.info> diff --git a/ceilometer/publisher/file.py b/ceilometer/publisher/file.py index 70f66281..d0edcfa1 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 922098af..51758097 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/publisher/test.py b/ceilometer/publisher/test.py index 37fbeb47..8164ec28 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 <julien@danjou.info> # diff --git a/ceilometer/publisher/udp.py b/ceilometer/publisher/udp.py index 39a9a9ba..6baac074 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 <julien@danjou.info>, # Tyaptin Ilya <ityaptin@mirantis.com> diff --git a/ceilometer/publisher/utils.py b/ceilometer/publisher/utils.py index 2d5409a6..85a9b62c 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 <doug.hellmann@dreamhost.com> # Tyaptin Ilya <ityaptin@mirantis.com> diff --git a/ceilometer/sample.py b/ceilometer/sample.py index 38f751ff..a9cd607f 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 <doug.hellmann@dreamhost.com> # Julien Danjou <julien@danjou.info> diff --git a/ceilometer/service.py b/ceilometer/service.py index 66df31b4..c1d76f30 100644 --- a/ceilometer/service.py +++ b/ceilometer/service.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -# -*- encoding: utf-8 -*- # -# Copyright © 2012-2014 eNovance <licensing@enovance.com> +# Copyright 2012-2014 eNovance <licensing@enovance.com> # # Author: Julien Danjou <julien@danjou.info> # diff --git a/ceilometer/storage/__init__.py b/ceilometer/storage/__init__.py index eefa5985..b8369631 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/storage/base.py b/ceilometer/storage/base.py index 31d4d904..cc828c80 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/storage/impl_db2.py b/ceilometer/storage/impl_db2.py index 26a2cdd2..82745467 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 <doug.hellmann@dreamhost.com> # Julien Danjou <julien@danjou.info> diff --git a/ceilometer/storage/impl_hbase.py b/ceilometer/storage/impl_hbase.py index 3c646223..c6d72226 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 <Stanislav_M@dell.com> # Author: Shengjie Min <Shengjie_Min@dell.com> diff --git a/ceilometer/storage/impl_log.py b/ceilometer/storage/impl_log.py index bce62316..87f655dc 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/storage/impl_mongodb.py b/ceilometer/storage/impl_mongodb.py index 13e7eec3..da103699 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 <doug.hellmann@dreamhost.com> # Julien Danjou <julien@danjou.info> diff --git a/ceilometer/storage/impl_sqlalchemy.py b/ceilometer/storage/impl_sqlalchemy.py index c28516fe..308013cc 100644 --- a/ceilometer/storage/impl_sqlalchemy.py +++ b/ceilometer/storage/impl_sqlalchemy.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Author: John Tran <jhtran@att.com> # Julien Danjou <julien@danjou.info> diff --git a/ceilometer/storage/models.py b/ceilometer/storage/models.py index b3c79afd..99d3c373 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/storage/pymongo_base.py b/ceilometer/storage/pymongo_base.py index 5840e346..1dd5f90c 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 c476edf8..925288c8 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 <jhtran@att.com> # 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 4b200bac..9e3f25da 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 <julien@danjou.info> # 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 c7b87790..724a1d5f 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 <gpernot@praksys.org> # 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 2914cfe3..0dd422c3 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 <julien@danjou.info> # 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 4c000bfb..38bb12b5 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 <licensing@enovance.com> +# Copyright 2013 eNovance SAS <licensing@enovance.com> # Author: François Charlier <francois.charlier@enovance.com> # # 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 703ade55..55b06c15 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 <licensing@enovance.com> -# Copyright © 2013 Red Hat, Inc. +# Copyright 2013 eNovance <licensing@enovance.com> +# Copyright 2013 Red Hat, Inc. # # Author: Mehdi Abaakouk <mehdi.abaakouk@enovance.com> # Angus Salkeld <asalkeld@redhat.com> 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 1b1ee879..f09c19b8 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 daee1565..0c37632c 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 754eee7d..eae78ad9 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 dcf10351..b8149d6a 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 cd5272cc..78c70b4c 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 3db9811b..8b87e605 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 <licensing@enovance.com> +# Copyright 2013 eNovance <licensing@enovance.com> # # Author: Julien Danjou <julien@danjou.info> # 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 dd4b76ea..2d246656 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 7223ba07..32af6c21 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 <eglynn@redhat.com> # 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 27dfd7f6..2002bcc6 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 <licensing@enovance.com> +# Copyright 2013 eNovance <licensing@enovance.com> # # Author: Mehdi Abaakouk <mehdi.abaakouk@enovance.com> # 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 8c0c3fb5..0c266447 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 <thomas.maddox@rackspace.com> # 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 6fa3334a..fe606524 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 ff8698c3..dc877ccb 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 887d12d7..1baae51a 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 aaa438f2..81e031f3 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 a8f7856c..1f76f7d4 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 d30ec9ef..837b2680 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 <licensing@enovance.com> +# Copyright 2013 eNovance SAS <licensing@enovance.com> # # Author: Mehdi Abaakouk <mehdi.abaakouk@enovance.com> # 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 7dc0c43e..32ca640b 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 <licensing@enovance.com> +# Copyright 2013 eNovance SAS <licensing@enovance.com> # # Author: Mehdi Abaakouk <mehdi.abaakouk@enovance.com> # 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 6c5fa85e..8f7d3c1c 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 fc936653..78e9947e 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 <lianhao.lu@intel.com> # 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 d36ed442..bce5ad50 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 72db7ba7..ee9f2dc7 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 d19f5752..269bc2fd 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 cbc577ee..b5e64c1c 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 <nejc.saje@xlab.si> # 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 4eb795f9..72c6831b 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 9a2a83af..641c7eff 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 373da632..7b95d7f7 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 4e112bc0..931b03d6 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 6a2bd670..1073881b 100644 --- a/ceilometer/storage/sqlalchemy/migration.py +++ b/ceilometer/storage/sqlalchemy/migration.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Author: John Tran <jhtran@att.com> # Julien Danjou <julien@danjou.info> diff --git a/ceilometer/storage/sqlalchemy/models.py b/ceilometer/storage/sqlalchemy/models.py index 8de15153..e820d5d3 100644 --- a/ceilometer/storage/sqlalchemy/models.py +++ b/ceilometer/storage/sqlalchemy/models.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Author: John Tran <jhtran@att.com> # diff --git a/ceilometer/tests/agentbase.py b/ceilometer/tests/agentbase.py index 3af2d889..2eec3742 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 <yunhong.jiang@intel.com> # Julien Danjou <julien@danjou.info> diff --git a/ceilometer/tests/alarm/evaluator/base.py b/ceilometer/tests/alarm/evaluator/base.py index c16bcf73..e3c28b83 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 <licensing@enovance.com> +# Copyright 2013 eNovance <licensing@enovance.com> # # Author: Mehdi Abaakouk <mehdi.abaakouk@enovance.com> # Eoghan Glynn <eglynn@redhat.com> diff --git a/ceilometer/tests/alarm/evaluator/test_base.py b/ceilometer/tests/alarm/evaluator/test_base.py index c9dc9649..3a0b62b6 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 <litong01@us.ibm.com> # diff --git a/ceilometer/tests/alarm/evaluator/test_combination.py b/ceilometer/tests/alarm/evaluator/test_combination.py index 1f623ca5..1189f5a2 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 <licensing@enovance.com> +# Copyright 2013 eNovance <licensing@enovance.com> # # Authors: Mehdi Abaakouk <mehdi.abaakouk@enovance.com> # diff --git a/ceilometer/tests/alarm/evaluator/test_threshold.py b/ceilometer/tests/alarm/evaluator/test_threshold.py index 6966232f..6b8efd14 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 <eglynn@redhat.com> # diff --git a/ceilometer/tests/alarm/partition/test_coordination.py b/ceilometer/tests/alarm/partition/test_coordination.py index 707122ea..0da005d5 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 <eglynn@redhat.com> # diff --git a/ceilometer/tests/alarm/test_notifier.py b/ceilometer/tests/alarm/test_notifier.py index 3e4ba8ac..4a88b271 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 <julien@danjou.info> # diff --git a/ceilometer/tests/alarm/test_partitioned_alarm_svc.py b/ceilometer/tests/alarm/test_partitioned_alarm_svc.py index 2b2769ea..739d4997 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 <eglynn@redhat.com> # diff --git a/ceilometer/tests/alarm/test_rpc.py b/ceilometer/tests/alarm/test_rpc.py index 35b5f33d..55d2def8 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 <licensing@enovance.com> +# Copyright 2013 eNovance <licensing@enovance.com> # # Authors: Mehdi Abaakouk <mehdi.abaakouk@enovance.com> # diff --git a/ceilometer/tests/alarm/test_singleton_alarm_svc.py b/ceilometer/tests/alarm/test_singleton_alarm_svc.py index 7e3c1aed..c1353d29 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 <eglynn@redhat.com> # diff --git a/ceilometer/tests/api/__init__.py b/ceilometer/tests/api/__init__.py index e8cdf70b..993b48b2 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/tests/api/v2/__init__.py b/ceilometer/tests/api/v2/__init__.py index 70fc216f..5d7f1fec 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/tests/api/v2/test_acl_scenarios.py b/ceilometer/tests/api/v2/test_acl_scenarios.py index 685b6f24..03b68b56 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 <julien@danjou.info> # diff --git a/ceilometer/tests/api/v2/test_alarm_scenarios.py b/ceilometer/tests/api/v2/test_alarm_scenarios.py index aa3481ed..5a5ce3a8 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 <licensing@enovance.com> +# Copyright 2013 eNovance <licensing@enovance.com> # # Author: Mehdi Abaakouk <mehdi.abaakouk@enovance.com> # Angus Salkeld <asalkeld@redhat.com> diff --git a/ceilometer/tests/api/v2/test_app.py b/ceilometer/tests/api/v2/test_app.py index 0db1c92a..ac286b85 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 <julien@danjou.info> # diff --git a/ceilometer/tests/api/v2/test_capabilities.py b/ceilometer/tests/api/v2/test_capabilities.py index 8ecd1726..d25b3861 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 af78178d..b11e41b4 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 8980e0c1..0a46343c 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 01fa6c34..0a1435d5 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/tests/api/v2/test_event_scenarios.py b/ceilometer/tests/api/v2/test_event_scenarios.py index 6dd88644..26ba1d57 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 dda220f1..68d0adc8 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/tests/api/v2/test_list_meters_scenarios.py b/ceilometer/tests/api/v2/test_list_meters_scenarios.py index 7a50da10..a30e438a 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 c006a6eb..8666866f 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/tests/api/v2/test_post_samples_scenarios.py b/ceilometer/tests/api/v2/test_post_samples_scenarios.py index 925fdfcd..3140cdc3 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 <asalkeld@redhat.com> # diff --git a/ceilometer/tests/api/v2/test_statistics.py b/ceilometer/tests/api/v2/test_statistics.py index 6e82a3b4..0e56f7fa 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/tests/api/v2/test_statistics_scenarios.py b/ceilometer/tests/api/v2/test_statistics_scenarios.py index 42791104..fdb2c944 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/tests/api/v2/test_wsme_custom_type.py b/ceilometer/tests/api/v2/test_wsme_custom_type.py index 41ee886d..fbd81d18 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 <licensing@enovance.com> +# Copyright 2013 eNovance <licensing@enovance.com> # # Author: Mehdi Abaakouk <mehdi.abaakouk@enovance.com> # diff --git a/ceilometer/tests/base.py b/ceilometer/tests/base.py index 50710535..084a8de7 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/tests/central/test_manager.py b/ceilometer/tests/central/test_manager.py index 2258ce48..71182ee1 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 <lianhao.lu@intel.com> # diff --git a/ceilometer/tests/compute/notifications/test_cpu.py b/ceilometer/tests/compute/notifications/test_cpu.py index 0ce3f8a5..300636ad 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 <Shuangtai.tian@intel.com> # diff --git a/ceilometer/tests/compute/notifications/test_instance.py b/ceilometer/tests/compute/notifications/test_instance.py index 3fce11c1..ee2d7d04 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 <doug.hellmann@dreamhost.com> # Julien Danjou <julien@danjou.info> diff --git a/ceilometer/tests/compute/pollsters/base.py b/ceilometer/tests/compute/pollsters/base.py index 02f0459d..e7ff4b2d 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 <licensing@enovance.com> -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance <licensing@enovance.com> +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou <julien@danjou.info> # Author: Eoghan Glynn <eglynn@redhat.com> diff --git a/ceilometer/tests/compute/pollsters/test_cpu.py b/ceilometer/tests/compute/pollsters/test_cpu.py index de4b39de..8a46381d 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 <licensing@enovance.com> -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance <licensing@enovance.com> +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou <julien@danjou.info> # Author: Eoghan Glynn <eglynn@redhat.com> diff --git a/ceilometer/tests/compute/pollsters/test_diskio.py b/ceilometer/tests/compute/pollsters/test_diskio.py index b9cf81c9..6226c43f 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 <licensing@enovance.com> -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance <licensing@enovance.com> +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou <julien@danjou.info> # Author: Eoghan Glynn <eglynn@redhat.com> diff --git a/ceilometer/tests/compute/pollsters/test_instance.py b/ceilometer/tests/compute/pollsters/test_instance.py index 80261b0a..543643d3 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 <licensing@enovance.com> -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance <licensing@enovance.com> +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou <julien@danjou.info> # Author: Eoghan Glynn <eglynn@redhat.com> diff --git a/ceilometer/tests/compute/pollsters/test_location_metadata.py b/ceilometer/tests/compute/pollsters/test_location_metadata.py index 638b7148..083752f2 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 <licensing@enovance.com> -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance <licensing@enovance.com> +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou <julien@danjou.info> # Author: Eoghan Glynn <eglynn@redhat.com> diff --git a/ceilometer/tests/compute/pollsters/test_net.py b/ceilometer/tests/compute/pollsters/test_net.py index 1eaaa2ab..44bb5847 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 <licensing@enovance.com> -# Copyright © 2012 Red Hat, Inc +# Copyright 2012 eNovance <licensing@enovance.com> +# Copyright 2012 Red Hat, Inc # # Author: Julien Danjou <julien@danjou.info> # Author: Eoghan Glynn <eglynn@redhat.com> diff --git a/ceilometer/tests/compute/test_manager.py b/ceilometer/tests/compute/test_manager.py index a4bf562f..1d968519 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/tests/compute/virt/libvirt/test_inspector.py b/ceilometer/tests/compute/virt/libvirt/test_inspector.py index 4b8ee07a..2d42771b 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 <eglynn@redhat.com> # diff --git a/ceilometer/tests/db.py b/ceilometer/tests/db.py index 00ad5f2c..2f3c2d27 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 <doug.hellmann@dreamhost.com> # Julien Danjou <julien@danjou.info> diff --git a/ceilometer/tests/dispatcher/test_db.py b/ceilometer/tests/dispatcher/test_db.py index 4aac6350..9fab137c 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 <litong01@us.ibm.com> # diff --git a/ceilometer/tests/dispatcher/test_file.py b/ceilometer/tests/dispatcher/test_file.py index e933f243..2f49d9dc 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 <litong01@us.ibm.com> # diff --git a/ceilometer/tests/event/test_converter.py b/ceilometer/tests/event/test_converter.py index a7a1386a..b48afe37 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 <mdragon@rackspace.com> # diff --git a/ceilometer/tests/event/test_endpoint.py b/ceilometer/tests/event/test_endpoint.py index 2f930147..03db8d82 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/tests/event/test_trait_plugins.py b/ceilometer/tests/event/test_trait_plugins.py index 8197b84b..8899833b 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 <mdragon@rackspace.com> # diff --git a/ceilometer/tests/hardware/inspector/base.py b/ceilometer/tests/hardware/inspector/base.py index 4981a513..0c6c88ad 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 <lianhao.lu@intel.com> # diff --git a/ceilometer/tests/hardware/inspector/test_inspector.py b/ceilometer/tests/hardware/inspector/test_inspector.py index 982b5d86..b4bf20f1 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 <lianhao.lu@intel.com> # diff --git a/ceilometer/tests/hardware/inspector/test_snmp.py b/ceilometer/tests/hardware/inspector/test_snmp.py index 39191383..393b16f7 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 <lianhao.lu@intel.com> # diff --git a/ceilometer/tests/hardware/pollsters/base.py b/ceilometer/tests/hardware/pollsters/base.py index d1412e4c..966aa7f2 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 <lianhao.lu@intel.com> # diff --git a/ceilometer/tests/hardware/pollsters/test_cpu.py b/ceilometer/tests/hardware/pollsters/test_cpu.py index 63aa7184..c1062823 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 <lianhao.lu@intel.com> # diff --git a/ceilometer/tests/hardware/pollsters/test_disk.py b/ceilometer/tests/hardware/pollsters/test_disk.py index 7ac74767..55b46323 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 <lianhao.lu@intel.com> # diff --git a/ceilometer/tests/hardware/pollsters/test_memory.py b/ceilometer/tests/hardware/pollsters/test_memory.py index 56840e74..2fb4700d 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 <lianhao.lu@intel.com> # diff --git a/ceilometer/tests/hardware/pollsters/test_net.py b/ceilometer/tests/hardware/pollsters/test_net.py index 1928fc68..770dde7e 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 <lianhao.lu@intel.com> # diff --git a/ceilometer/tests/image/test_glance.py b/ceilometer/tests/image/test_glance.py index d8a65f25..23b448a4 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 <julien@danjou.info> # diff --git a/ceilometer/tests/image/test_notifications.py b/ceilometer/tests/image/test_notifications.py index fb8d895d..5896fba0 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 <eglynn@redhat.com> # Author: Julien danjou <julien@danjou.info> diff --git a/ceilometer/tests/network/test_floatingip.py b/ceilometer/tests/network/test_floatingip.py index 254d088d..9e098712 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 <licensing@enovance.com> +# Copyright 2012 eNovance <licensing@enovance.com> # # Copyright 2013 IBM Corp # All Rights Reserved. diff --git a/ceilometer/tests/network/test_notifications.py b/ceilometer/tests/network/test_notifications.py index 5cab884f..c60a5be4 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 <julien@danjou.info> # diff --git a/ceilometer/tests/objectstore/test_swift.py b/ceilometer/tests/objectstore/test_swift.py index 3a847212..f66fed9a 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 <licensing@enovance.com> +# Copyright 2012 eNovance <licensing@enovance.com> # # Author: Guillaume Pernot <gpernot@praksys.org> # diff --git a/ceilometer/tests/objectstore/test_swift_middleware.py b/ceilometer/tests/objectstore/test_swift_middleware.py index d3ac36b2..fd8f80f8 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 <licensing@enovance.com> +# Copyright 2012 eNovance <licensing@enovance.com> # # Author: Julien Danjou <julien@danjou.info> # diff --git a/ceilometer/tests/pipeline_base.py b/ceilometer/tests/pipeline_base.py index f4f5a648..831c1838 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 <yunhong.jiang@intel.com> # Julien Danjou <julien@danjou.info> diff --git a/ceilometer/tests/publisher/test_file.py b/ceilometer/tests/publisher/test_file.py index 9715271c..74625749 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 <julien@danjou.info> # diff --git a/ceilometer/tests/publisher/test_rpc_publisher.py b/ceilometer/tests/publisher/test_rpc_publisher.py index 6afc239f..3f910a60 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 <doug.hellmann@dreamhost.com> # Julien Danjou <julien@danjou.info> diff --git a/ceilometer/tests/publisher/test_udp.py b/ceilometer/tests/publisher/test_udp.py index b6cc52c8..1a49b53e 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 <julien@danjou.info> # diff --git a/ceilometer/tests/publisher/test_utils.py b/ceilometer/tests/publisher/test_utils.py index 45718577..ab9564bf 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 <doug.hellmann@dreamhost.com> # Julien Danjou <julien@danjou.info> diff --git a/ceilometer/tests/storage/sqlalchemy/test_models.py b/ceilometer/tests/storage/sqlalchemy/test_models.py index 0a542b1c..17b5b7f9 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 <thomas.maddox@rackspace.com> # diff --git a/ceilometer/tests/storage/test_base.py b/ceilometer/tests/storage/test_base.py index b34479dd..2410f2e4 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 <julien@danjou.info> # diff --git a/ceilometer/tests/storage/test_get_connection.py b/ceilometer/tests/storage/test_get_connection.py index 1f6498f2..bf05cf34 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/tests/storage/test_impl_db2.py b/ceilometer/tests/storage/test_impl_db2.py index 303d9e29..920ddc27 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 4785c880..3941c9ae 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 <Stanislav_M@dell.com> # Author: Shengjie Min <Shengjie_Min@dell.com> diff --git a/ceilometer/tests/storage/test_impl_log.py b/ceilometer/tests/storage/test_impl_log.py index 10062c87..602956c1 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/tests/storage/test_impl_mongodb.py b/ceilometer/tests/storage/test_impl_mongodb.py index 2d986182..5331bb99 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/tests/storage/test_impl_sqlalchemy.py b/ceilometer/tests/storage/test_impl_sqlalchemy.py index 0b742995..0353bfd6 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 <jhtran@att.com> # Julien Danjou <julien@danjou.info> diff --git a/ceilometer/tests/storage/test_models.py b/ceilometer/tests/storage/test_models.py index c1217940..be20c734 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/tests/storage/test_pymongo_base.py b/ceilometer/tests/storage/test_pymongo_base.py index 0fad6432..639cdd69 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 27b0c3f9..b62398cc 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 <lianhao.lu@intel.com> # Shane Wang <shane.wang@intel.com> diff --git a/ceilometer/tests/test_bin.py b/ceilometer/tests/test_bin.py index d4dc4a8b..2f4789bb 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 <licensing@enovance.com> +# Copyright 2012 eNovance <licensing@enovance.com> # # Author: Julien Danjou <julien@danjou.info> # diff --git a/ceilometer/tests/test_collector.py b/ceilometer/tests/test_collector.py index 773d4033..74b4e344 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/tests/test_decoupled_pipeline.py b/ceilometer/tests/test_decoupled_pipeline.py index 293adb32..02e44e89 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 <eglynn@redhat.com> # diff --git a/ceilometer/tests/test_deprecated_pipeline.py b/ceilometer/tests/test_deprecated_pipeline.py index 606dcade..7930e3ed 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 <eglynn@redhat.com> # diff --git a/ceilometer/tests/test_middleware.py b/ceilometer/tests/test_middleware.py index 196943db..10d6e4bf 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 <julien@danjou.info> # diff --git a/ceilometer/tests/test_notification.py b/ceilometer/tests/test_notification.py index 4d7d8a88..0601e6dd 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 <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/tests/test_notifier.py b/ceilometer/tests/test_notifier.py index 4d093fa7..1b3ece2d 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 <julien@danjou.info> # diff --git a/ceilometer/tests/test_novaclient.py b/ceilometer/tests/test_novaclient.py index 742ab6b1..7733921b 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 <licensing@enovance.com> +# Copyright 2013 eNovance <licensing@enovance.com> # # Author: Julien Danjou <julien@danjou.info> # diff --git a/ceilometer/tests/test_plugin.py b/ceilometer/tests/test_plugin.py index 344c2712..3f06ccad 100644 --- a/ceilometer/tests/test_plugin.py +++ b/ceilometer/tests/test_plugin.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance <licensing@enovance.com> +# Copyright 2013 eNovance <licensing@enovance.com> # # Author: Julien Danjou <julien@danjou.info> # diff --git a/ceilometer/tests/test_utils.py b/ceilometer/tests/test_utils.py index d847016b..9576a65e 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 <doug.hellmann@dreamhost.com> diff --git a/ceilometer/transformer/__init__.py b/ceilometer/transformer/__init__.py index 0f9b0db7..4dcb2ad7 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 <yunhong.jiang@intel.com> # diff --git a/ceilometer/transformer/accumulator.py b/ceilometer/transformer/accumulator.py index 2b7bf016..0f858c50 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 <julien@danjou.info> # diff --git a/ceilometer/transformer/conversions.py b/ceilometer/transformer/conversions.py index 44f563b6..3abc30cc 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 <eglynn@redhat.com> # diff --git a/ceilometer/volume/notifications.py b/ceilometer/volume/notifications.py index 2a0fdfee..92736852 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 <julien@danjou.info> # diff --git a/doc/source/conf.py b/doc/source/conf.py index 5102e357..509eb8e7 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 bf5b8dbb..1db4852e 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 <lianhao.lu@intel.com> # diff --git a/nova_tests/test_notifier.py b/nova_tests/test_notifier.py index 6adec540..3cfeebac 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 <julien@danjou.info> # Doug Hellmann <doug.hellmann@dreamhost.com> diff --git a/tools/make_test_data.py b/tools/make_test_data.py index 95c37cf7..4d2f3d81 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 <doug.hellmann@dreamhost.com> # diff --git a/tools/release-bugs.py b/tools/release-bugs.py index ee3ca9b6..2314c813 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 <graham.binns@gmail.com> # diff --git a/tools/show_data.py b/tools/show_data.py index d5c48003..06142593 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 <doug.hellmann@dreamhost.com> # |