Merge "Expand © and remove unnecessary encoding lines"

23 files changed, 4 insertions, 27 deletions

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 1369c50..c855bbf 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # pyCADF documentation build configuration file, created by
 # sphinx-quickstart on Sun Mar 16 22:32:24 2014.
diff --git a/pycadf/attachment.py b/pycadf/attachment.py
index 9b5e43e..ca83934 100644
--- a/pycadf/attachment.py
+++ b/pycadf/attachment.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp.
 #
diff --git a/pycadf/audit/api.py b/pycadf/audit/api.py
index d8c9402..411e1a9 100644
--- a/pycadf/audit/api.py
+++ b/pycadf/audit/api.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp.
 #
diff --git a/pycadf/cadftaxonomy.py b/pycadf/cadftaxonomy.py
index f1f37ff..bf7c541 100644
--- a/pycadf/cadftaxonomy.py
+++ b/pycadf/cadftaxonomy.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp.
 #
diff --git a/pycadf/cadftype.py b/pycadf/cadftype.py
index 5702e4f..f9f3096 100644
--- a/pycadf/cadftype.py
+++ b/pycadf/cadftype.py
@@ -1,6 +1,5 @@
-# -*- encoding: utf-8 -*-
 #
-# Copyright © 2013 IBM Corporation
+# Copyright (c) 2013 IBM Corporation
 #
 # Author: Matt Rutkowski <mrutkows@us.ibm.com>
 #
diff --git a/pycadf/credential.py b/pycadf/credential.py
index e8836ce..09715ef 100644
--- a/pycadf/credential.py
+++ b/pycadf/credential.py
@@ -1,6 +1,5 @@
-# -*- encoding: utf-8 -*-
 #
-# Copyright © 2013 IBM Corporation
+# Copyright (c) 2013 IBM Corporation
 #
 # 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/pycadf/endpoint.py b/pycadf/endpoint.py
index b31a000..a769b11 100644
--- a/pycadf/endpoint.py
+++ b/pycadf/endpoint.py
@@ -1,6 +1,5 @@
-# -*- encoding: utf-8 -*-
 #
-# Copyright © 2013 IBM Corporation
+# Copyright (c) 2013 IBM Corporation
 #
 # 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/pycadf/event.py b/pycadf/event.py
index 92a39c8..8bd4f69 100644
--- a/pycadf/event.py
+++ b/pycadf/event.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp.
 #
diff --git a/pycadf/eventfactory.py b/pycadf/eventfactory.py
index f276860..fa079d0 100644
--- a/pycadf/eventfactory.py
+++ b/pycadf/eventfactory.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp.
 #
diff --git a/pycadf/geolocation.py b/pycadf/geolocation.py
index 85e6a97..fcbaee9 100644
--- a/pycadf/geolocation.py
+++ b/pycadf/geolocation.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp.
 #
diff --git a/pycadf/host.py b/pycadf/host.py
index c5a8e7a..f55cdcb 100644
--- a/pycadf/host.py
+++ b/pycadf/host.py
@@ -1,6 +1,5 @@
-# -*- encoding: utf-8 -*-
 #
-# Copyright © 2013 IBM Corporation
+# Copyright (c) 2013 IBM Corporation
 #
 # 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/pycadf/identifier.py b/pycadf/identifier.py
index 28713dc..2035b97 100644
--- a/pycadf/identifier.py
+++ b/pycadf/identifier.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp.
 #
diff --git a/pycadf/measurement.py b/pycadf/measurement.py
index 8ff72bf..cb6c577 100644
--- a/pycadf/measurement.py
+++ b/pycadf/measurement.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp.
 #
diff --git a/pycadf/metric.py b/pycadf/metric.py
index f8b4ae0..e0f5fa5 100644
--- a/pycadf/metric.py
+++ b/pycadf/metric.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp.
 #
diff --git a/pycadf/path.py b/pycadf/path.py
index b76ca9f..7d605c9 100644
--- a/pycadf/path.py
+++ b/pycadf/path.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp.
 #
diff --git a/pycadf/reason.py b/pycadf/reason.py
index ae70fb1..260750a 100644
--- a/pycadf/reason.py
+++ b/pycadf/reason.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp.
 #
diff --git a/pycadf/reporterstep.py b/pycadf/reporterstep.py
index 1c307c2..232cf2e 100644
--- a/pycadf/reporterstep.py
+++ b/pycadf/reporterstep.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp.
 #
diff --git a/pycadf/resource.py b/pycadf/resource.py
index 48ad7dc..4e91240 100644
--- a/pycadf/resource.py
+++ b/pycadf/resource.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp.
 #
diff --git a/pycadf/tag.py b/pycadf/tag.py
index 3ee78e0..ef7c671 100644
--- a/pycadf/tag.py
+++ b/pycadf/tag.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp.
 #
diff --git a/pycadf/tests/audit/test_api.py b/pycadf/tests/audit/test_api.py
index cce6dc3..c578257 100644
--- a/pycadf/tests/audit/test_api.py
+++ b/pycadf/tests/audit/test_api.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp.
 #
diff --git a/pycadf/tests/base.py b/pycadf/tests/base.py
index f14f9da..fedb245 100644
--- a/pycadf/tests/base.py
+++ b/pycadf/tests/base.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp.
 #
diff --git a/pycadf/timestamp.py b/pycadf/timestamp.py
index 82383c0..5e3d4c7 100644
--- a/pycadf/timestamp.py
+++ b/pycadf/timestamp.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp.
 #
diff --git a/pycadf/utils.py b/pycadf/utils.py
index 75a96ef..2cbaed2 100644
--- a/pycadf/utils.py
+++ b/pycadf/utils.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp.
 #