From 4645597ef6e7a2369d67a969247c92d1b65eb913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=A1gr?= Date: Thu, 26 Oct 2017 11:36:38 +0200 Subject: [PATCH] Revert "Removes unnecessary utf-8 encoding" This reverts commit 4076dce887b84ab4298c54eb422a069e006e590b. Commit above is the cause for UTF errors such as: [root@undercloud-0 ~]# /usr/libexec/openstack-monitoring/checks/oschecks-check_amqp neutron-server Traceback (most recent call last): File "/usr/libexec/openstack-monitoring/checks/oschecks-check_amqp", line 6, in from oschecks.amqp import main File "/usr/lib/python2.7/site-packages/oschecks/amqp.py", line 23, in from oschecks import utils File "/usr/lib/python2.7/site-packages/oschecks/utils.py", line 5 SyntaxError: Non-ASCII character '\xc2' in file /usr/lib/python2.7/site-packages/oschecks/utils.py on line 5, but no encoding declared; see http://www.python.org/peps/pep-0263.html for details Change-Id: I94faa925bb642621bc8688addca60168889e93d3 --- monitoring-for-openstack/doc/source/conf.py | 2 ++ monitoring-for-openstack/oschecks/amqp.py | 1 + monitoring-for-openstack/oschecks/ceilometer.py | 1 + monitoring-for-openstack/oschecks/ceph.py | 1 + monitoring-for-openstack/oschecks/cinder.py | 1 + monitoring-for-openstack/oschecks/glance.py | 1 + monitoring-for-openstack/oschecks/keystone.py | 1 + monitoring-for-openstack/oschecks/neutron.py | 1 + monitoring-for-openstack/oschecks/nova.py | 1 + monitoring-for-openstack/oschecks/pacemaker_host_check.py | 1 + monitoring-for-openstack/oschecks/process.py | 1 + monitoring-for-openstack/oschecks/tests/test_ceph.py | 2 ++ monitoring-for-openstack/oschecks/tests/test_script.py | 2 ++ monitoring-for-openstack/oschecks/utils.py | 1 + 14 files changed, 17 insertions(+) diff --git a/monitoring-for-openstack/doc/source/conf.py b/monitoring-for-openstack/doc/source/conf.py index 365e054..e5a1293 100644 --- a/monitoring-for-openstack/doc/source/conf.py +++ b/monitoring-for-openstack/doc/source/conf.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- +# # monitoring-for-openstack documentation build configuration file, created by # sphinx-quickstart on Tue Oct 28 18:03:41 2014. # diff --git a/monitoring-for-openstack/oschecks/amqp.py b/monitoring-for-openstack/oschecks/amqp.py index 2879557..e308bf1 100644 --- a/monitoring-for-openstack/oschecks/amqp.py +++ b/monitoring-for-openstack/oschecks/amqp.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # Openstack Monitoring script for Sensu / Nagios # diff --git a/monitoring-for-openstack/oschecks/ceilometer.py b/monitoring-for-openstack/oschecks/ceilometer.py index 2f23a13..58d8713 100644 --- a/monitoring-for-openstack/oschecks/ceilometer.py +++ b/monitoring-for-openstack/oschecks/ceilometer.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # Openstack Monitoring script for Sensu / Nagios # diff --git a/monitoring-for-openstack/oschecks/ceph.py b/monitoring-for-openstack/oschecks/ceph.py index 8e2f4fc..5d5bda7 100644 --- a/monitoring-for-openstack/oschecks/ceph.py +++ b/monitoring-for-openstack/oschecks/ceph.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # # Copyright (C) 2014 eNovance SAS # diff --git a/monitoring-for-openstack/oschecks/cinder.py b/monitoring-for-openstack/oschecks/cinder.py index 0df01ca..4fe959e 100644 --- a/monitoring-for-openstack/oschecks/cinder.py +++ b/monitoring-for-openstack/oschecks/cinder.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # Openstack Monitoring script for Sensu / Nagios # diff --git a/monitoring-for-openstack/oschecks/glance.py b/monitoring-for-openstack/oschecks/glance.py index 67f985f..ae438db 100644 --- a/monitoring-for-openstack/oschecks/glance.py +++ b/monitoring-for-openstack/oschecks/glance.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # Openstack Monitoring script for Sensu / Nagios # diff --git a/monitoring-for-openstack/oschecks/keystone.py b/monitoring-for-openstack/oschecks/keystone.py index 41e804a..1da4d52 100644 --- a/monitoring-for-openstack/oschecks/keystone.py +++ b/monitoring-for-openstack/oschecks/keystone.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # Openstack Monitoring script for Sensu / Nagios # diff --git a/monitoring-for-openstack/oschecks/neutron.py b/monitoring-for-openstack/oschecks/neutron.py index a910840..1eb3dc3 100644 --- a/monitoring-for-openstack/oschecks/neutron.py +++ b/monitoring-for-openstack/oschecks/neutron.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # Openstack Monitoring script for Sensu / Nagios # diff --git a/monitoring-for-openstack/oschecks/nova.py b/monitoring-for-openstack/oschecks/nova.py index 05d679d..8afe94e 100644 --- a/monitoring-for-openstack/oschecks/nova.py +++ b/monitoring-for-openstack/oschecks/nova.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # Openstack Monitoring script for Sensu / Nagios # diff --git a/monitoring-for-openstack/oschecks/pacemaker_host_check.py b/monitoring-for-openstack/oschecks/pacemaker_host_check.py index ed31fcc..d0f326b 100644 --- a/monitoring-for-openstack/oschecks/pacemaker_host_check.py +++ b/monitoring-for-openstack/oschecks/pacemaker_host_check.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # Openstack Monitoring script for Sensu / Nagios # diff --git a/monitoring-for-openstack/oschecks/process.py b/monitoring-for-openstack/oschecks/process.py index 9b5d138..6cf7465 100644 --- a/monitoring-for-openstack/oschecks/process.py +++ b/monitoring-for-openstack/oschecks/process.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # Openstack Monitoring script for Sensu / Nagios # diff --git a/monitoring-for-openstack/oschecks/tests/test_ceph.py b/monitoring-for-openstack/oschecks/tests/test_ceph.py index fc39cd9..cac4326 100644 --- a/monitoring-for-openstack/oschecks/tests/test_ceph.py +++ b/monitoring-for-openstack/oschecks/tests/test_ceph.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- +# # Copyright (C) 2014 eNovance SAS # # Author: Frederic Lepied diff --git a/monitoring-for-openstack/oschecks/tests/test_script.py b/monitoring-for-openstack/oschecks/tests/test_script.py index 49dbedf..51b2a9a 100644 --- a/monitoring-for-openstack/oschecks/tests/test_script.py +++ b/monitoring-for-openstack/oschecks/tests/test_script.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- +# # Copyright (C) 2014 eNovance SAS # # Author: Julien Danjou diff --git a/monitoring-for-openstack/oschecks/utils.py b/monitoring-for-openstack/oschecks/utils.py index 619cb87..94e5e19 100644 --- a/monitoring-for-openstack/oschecks/utils.py +++ b/monitoring-for-openstack/oschecks/utils.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # Openstack Monitoring script for Sensu / Nagios #