Merge "Remove © and remove unnecessary encoding lines"

14 files changed, 5 insertions, 19 deletions

diff --git a/ceilometerclient/tests/v2/test_alarms.py b/ceilometerclient/tests/v2/test_alarms.py
index bfa7f85..13d04d1 100644
--- a/ceilometerclient/tests/v2/test_alarms.py
+++ b/ceilometerclient/tests/v2/test_alarms.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/ceilometerclient/tests/v2/test_event_types.py b/ceilometerclient/tests/v2/test_event_types.py
index 85c59ec..08a25a4 100644
--- a/ceilometerclient/tests/v2/test_event_types.py
+++ b/ceilometerclient/tests/v2/test_event_types.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright 2014 Hewlett-Packard Development Company, L.P.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/ceilometerclient/tests/v2/test_events.py b/ceilometerclient/tests/v2/test_events.py
index ee90a14..96cf7f5 100644
--- a/ceilometerclient/tests/v2/test_events.py
+++ b/ceilometerclient/tests/v2/test_events.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright 2014 Hewlett-Packard Development Company, L.P.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/ceilometerclient/tests/v2/test_trait_descriptions.py b/ceilometerclient/tests/v2/test_trait_descriptions.py
index 4c84f3c..0b273f0 100644
--- a/ceilometerclient/tests/v2/test_trait_descriptions.py
+++ b/ceilometerclient/tests/v2/test_trait_descriptions.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright 2014 Hewlett-Packard Development Company, L.P.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/ceilometerclient/tests/v2/test_traits.py b/ceilometerclient/tests/v2/test_traits.py
index 697acf1..f8239a0 100644
--- a/ceilometerclient/tests/v2/test_traits.py
+++ b/ceilometerclient/tests/v2/test_traits.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright 2014 Hewlett-Packard Development Company, L.P.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/ceilometerclient/v2/alarms.py b/ceilometerclient/v2/alarms.py
index 837904c..50fa1e4 100644
--- a/ceilometerclient/v2/alarms.py
+++ b/ceilometerclient/v2/alarms.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/ceilometerclient/v2/event_types.py b/ceilometerclient/v2/event_types.py
index 036eb3e..631f0b4 100644
--- a/ceilometerclient/v2/event_types.py
+++ b/ceilometerclient/v2/event_types.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright 2014 Hewlett-Packard Development Company, L.P.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/ceilometerclient/v2/events.py b/ceilometerclient/v2/events.py
index 0e245bb..bf96d4c 100644
--- a/ceilometerclient/v2/events.py
+++ b/ceilometerclient/v2/events.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright 2014 Hewlett-Packard Development Company, L.P.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/ceilometerclient/v2/meters.py b/ceilometerclient/v2/meters.py
index baa7cbd..938854d 100644
--- a/ceilometerclient/v2/meters.py
+++ b/ceilometerclient/v2/meters.py
@@ -1,6 +1,5 @@
-# -*- encoding: utf-8 -*-
 #
-# Copyright © 2013 Red Hat, Inc
+# Copyright 2013 Red Hat, Inc
 #
 #    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/ceilometerclient/v2/resources.py b/ceilometerclient/v2/resources.py
index 59adb95..897033e 100644
--- a/ceilometerclient/v2/resources.py
+++ b/ceilometerclient/v2/resources.py
@@ -1,6 +1,5 @@
-# -*- encoding: utf-8 -*-
 #
-# Copyright © 2013 Red Hat, Inc
+# Copyright 2013 Red Hat, Inc
 #
 #    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/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py
index c603814..54d34ab 100644
--- a/ceilometerclient/v2/shell.py
+++ b/ceilometerclient/v2/shell.py
@@ -1,6 +1,5 @@
-# -*- encoding: utf-8 -*-
 #
-# Copyright © 2013 Red Hat, Inc
+# Copyright 2013 Red Hat, Inc
 # Copyright Ericsson AB 2014. All rights reserved
 #
 # Authors: Angus Salkeld <asalkeld@redhat.com>
diff --git a/ceilometerclient/v2/trait_descriptions.py b/ceilometerclient/v2/trait_descriptions.py
index b6a0372..418647a 100644
--- a/ceilometerclient/v2/trait_descriptions.py
+++ b/ceilometerclient/v2/trait_descriptions.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright 2013 Hewlett-Packard Development Company, L.P.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/ceilometerclient/v2/traits.py b/ceilometerclient/v2/traits.py
index fbeb22a..55f8960 100644
--- a/ceilometerclient/v2/traits.py
+++ b/ceilometerclient/v2/traits.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright 2013 Hewlett-Packard Development Company, L.P.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/doc/source/conf.py b/doc/source/conf.py
index d91350b..0d030d1 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 
 project = 'python-ceilometerclient'