Merge "Remove © and remove unnecessary encoding lines"

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>
 #

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

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

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

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

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>
 #

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

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

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

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

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>

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

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

doc/source/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 
 project = 'python-ceilometerclient'