From: Jochen Sprickerhof Date: Fri, 18 Oct 2019 13:11:26 +0200 Subject: Switch to Python 3 --- diagnostic_aggregator/scripts/add_analyzers | 2 +- diagnostic_aggregator/test/add_analyzers_test.py | 2 +- diagnostic_aggregator/test/aggregator_test.py | 2 +- diagnostic_aggregator/test/diag_pub.py | 2 +- diagnostic_aggregator/test/expected_stale_pub.py | 2 +- diagnostic_aggregator/test/expected_stale_test.py | 2 +- diagnostic_aggregator/test/multiple_match_pub.py | 2 +- diagnostic_aggregator/test/multiple_match_test.py | 2 +- diagnostic_analysis/scripts/export_csv.py | 2 +- diagnostic_analysis/scripts/sparse_csv.py | 2 +- diagnostic_common_diagnostics/setup.py | 2 +- .../src/diagnostic_common_diagnostics/cpu_monitor.py | 2 +- .../src/diagnostic_common_diagnostics/hd_monitor.py | 2 +- .../src/diagnostic_common_diagnostics/ntp_monitor.py | 2 +- .../src/diagnostic_common_diagnostics/sensors_monitor.py | 2 +- .../src/diagnostic_common_diagnostics/tf_monitor.py | 2 +- diagnostic_common_diagnostics/test/cpu_monitor_psutil_mock.py | 2 +- diagnostic_common_diagnostics/test/test_cpu_monitor.py | 2 +- diagnostic_updater/setup.py | 2 +- diagnostic_updater/src/diagnostic_updater/__init__.py | 2 +- diagnostic_updater/src/example.py | 2 +- diagnostic_updater/test/diagnostic_updater_test.py | 2 +- diagnostic_updater/test/test_DiagnosticStatusWrapper.py | 2 +- rosdiagnostic/scripts/rosdiagnostic | 2 +- rosdiagnostic/setup.py | 2 +- rosdiagnostic/src/rosdiagnostic/rosdiagnostic.py | 2 +- self_test/scripts/test_selftest.py | 2 +- test_diagnostic_aggregator/test/fail_init_test.py | 2 +- test_diagnostic_aggregator/test/match_analyze_pub.py | 2 +- test_diagnostic_aggregator/test/match_analyze_test.py | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/diagnostic_aggregator/scripts/add_analyzers b/diagnostic_aggregator/scripts/add_analyzers index de391a8..3898458 100755 --- a/diagnostic_aggregator/scripts/add_analyzers +++ b/diagnostic_aggregator/scripts/add_analyzers @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 NAME='add_analyzers' diff --git a/diagnostic_aggregator/test/add_analyzers_test.py b/diagnostic_aggregator/test/add_analyzers_test.py index 0cfd771..c7296a8 100755 --- a/diagnostic_aggregator/test/add_analyzers_test.py +++ b/diagnostic_aggregator/test/add_analyzers_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Software License Agreement (BSD License) # # Copyright (c) 2009, Willow Garage, Inc. diff --git a/diagnostic_aggregator/test/aggregator_test.py b/diagnostic_aggregator/test/aggregator_test.py index 426def9..859e2ab 100755 --- a/diagnostic_aggregator/test/aggregator_test.py +++ b/diagnostic_aggregator/test/aggregator_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Software License Agreement (BSD License) # # Copyright (c) 2009, Willow Garage, Inc. diff --git a/diagnostic_aggregator/test/diag_pub.py b/diagnostic_aggregator/test/diag_pub.py index b4f0cc1..6980696 100755 --- a/diagnostic_aggregator/test/diag_pub.py +++ b/diagnostic_aggregator/test/diag_pub.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Software License Agreement (BSD License) # # Copyright (c) 2009, Willow Garage, Inc. diff --git a/diagnostic_aggregator/test/expected_stale_pub.py b/diagnostic_aggregator/test/expected_stale_pub.py index 57e8701..6cf55a4 100755 --- a/diagnostic_aggregator/test/expected_stale_pub.py +++ b/diagnostic_aggregator/test/expected_stale_pub.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Software License Agreement (BSD License) # # Copyright (c) 2009, Willow Garage, Inc. diff --git a/diagnostic_aggregator/test/expected_stale_test.py b/diagnostic_aggregator/test/expected_stale_test.py index 442a959..ca0577f 100755 --- a/diagnostic_aggregator/test/expected_stale_test.py +++ b/diagnostic_aggregator/test/expected_stale_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Software License Agreement (BSD License) # # Copyright (c) 2009, Willow Garage, Inc. diff --git a/diagnostic_aggregator/test/multiple_match_pub.py b/diagnostic_aggregator/test/multiple_match_pub.py index 76ef132..27fb311 100755 --- a/diagnostic_aggregator/test/multiple_match_pub.py +++ b/diagnostic_aggregator/test/multiple_match_pub.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Software License Agreement (BSD License) # # Copyright (c) 2009, Willow Garage, Inc. diff --git a/diagnostic_aggregator/test/multiple_match_test.py b/diagnostic_aggregator/test/multiple_match_test.py index 8c58a2c..cf54ae9 100755 --- a/diagnostic_aggregator/test/multiple_match_test.py +++ b/diagnostic_aggregator/test/multiple_match_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Software License Agreement (BSD License) # # Copyright (c) 2009, Willow Garage, Inc. diff --git a/diagnostic_analysis/scripts/export_csv.py b/diagnostic_analysis/scripts/export_csv.py index d834ba1..d05cd91 100755 --- a/diagnostic_analysis/scripts/export_csv.py +++ b/diagnostic_analysis/scripts/export_csv.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # Software License Agreement (BSD License) # diff --git a/diagnostic_analysis/scripts/sparse_csv.py b/diagnostic_analysis/scripts/sparse_csv.py index 0938dbc..ff837e9 100755 --- a/diagnostic_analysis/scripts/sparse_csv.py +++ b/diagnostic_analysis/scripts/sparse_csv.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # Software License Agreement (BSD License) # diff --git a/diagnostic_common_diagnostics/setup.py b/diagnostic_common_diagnostics/setup.py index b477d2c..f40bd3b 100644 --- a/diagnostic_common_diagnostics/setup.py +++ b/diagnostic_common_diagnostics/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from setuptools import setup from catkin_pkg.python_setup import generate_distutils_setup diff --git a/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/cpu_monitor.py b/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/cpu_monitor.py index 52e9f64..4b28cd5 100755 --- a/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/cpu_monitor.py +++ b/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/cpu_monitor.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Software License Agreement (BSD License) # diff --git a/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/hd_monitor.py b/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/hd_monitor.py index 36467ed..c5f2132 100755 --- a/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/hd_monitor.py +++ b/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/hd_monitor.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # Software License Agreement (BSD License) diff --git a/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/ntp_monitor.py b/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/ntp_monitor.py index 11a7396..3b3e756 100755 --- a/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/ntp_monitor.py +++ b/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/ntp_monitor.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # Software License Agreement (BSD License) # diff --git a/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/sensors_monitor.py b/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/sensors_monitor.py index 2b4884b..fe5c845 100755 --- a/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/sensors_monitor.py +++ b/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/sensors_monitor.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Software License Agreement (BSD License) # diff --git a/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/tf_monitor.py b/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/tf_monitor.py index 5321793..2479157 100755 --- a/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/tf_monitor.py +++ b/diagnostic_common_diagnostics/src/diagnostic_common_diagnostics/tf_monitor.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # Software License Agreement (BSD License) diff --git a/diagnostic_common_diagnostics/test/cpu_monitor_psutil_mock.py b/diagnostic_common_diagnostics/test/cpu_monitor_psutil_mock.py index eac4162..ee94277 100755 --- a/diagnostic_common_diagnostics/test/cpu_monitor_psutil_mock.py +++ b/diagnostic_common_diagnostics/test/cpu_monitor_psutil_mock.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Software License Agreement (BSD License) # diff --git a/diagnostic_common_diagnostics/test/test_cpu_monitor.py b/diagnostic_common_diagnostics/test/test_cpu_monitor.py index a2d75e9..b81714c 100755 --- a/diagnostic_common_diagnostics/test/test_cpu_monitor.py +++ b/diagnostic_common_diagnostics/test/test_cpu_monitor.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Software License Agreement (BSD License) # diff --git a/diagnostic_updater/setup.py b/diagnostic_updater/setup.py index 6c8078a..4a4e5ae 100644 --- a/diagnostic_updater/setup.py +++ b/diagnostic_updater/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from setuptools import setup from catkin_pkg.python_setup import generate_distutils_setup diff --git a/diagnostic_updater/src/diagnostic_updater/__init__.py b/diagnostic_updater/src/diagnostic_updater/__init__.py index 256438a..8cb8fd7 100644 --- a/diagnostic_updater/src/diagnostic_updater/__init__.py +++ b/diagnostic_updater/src/diagnostic_updater/__init__.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # # Software License Agreement (BSD License) # diff --git a/diagnostic_updater/src/example.py b/diagnostic_updater/src/example.py index 0b0a998..fb9bc22 100755 --- a/diagnostic_updater/src/example.py +++ b/diagnostic_updater/src/example.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Software License Agreement (BSD License) # diff --git a/diagnostic_updater/test/diagnostic_updater_test.py b/diagnostic_updater/test/diagnostic_updater_test.py index 6975c6c..5ce9e4c 100755 --- a/diagnostic_updater/test/diagnostic_updater_test.py +++ b/diagnostic_updater/test/diagnostic_updater_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- """ diff --git a/diagnostic_updater/test/test_DiagnosticStatusWrapper.py b/diagnostic_updater/test/test_DiagnosticStatusWrapper.py index 53bc4c8..99678e0 100755 --- a/diagnostic_updater/test/test_DiagnosticStatusWrapper.py +++ b/diagnostic_updater/test/test_DiagnosticStatusWrapper.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- """ diff --git a/rosdiagnostic/scripts/rosdiagnostic b/rosdiagnostic/scripts/rosdiagnostic index 2983b31..5a2ef25 100755 --- a/rosdiagnostic/scripts/rosdiagnostic +++ b/rosdiagnostic/scripts/rosdiagnostic @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Software License Agreement (BSD License) # # Copyright (c) 2017, Clearpath Inc. diff --git a/rosdiagnostic/setup.py b/rosdiagnostic/setup.py index eb144a6..569db0c 100644 --- a/rosdiagnostic/setup.py +++ b/rosdiagnostic/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from setuptools import setup from catkin_pkg.python_setup import generate_distutils_setup diff --git a/rosdiagnostic/src/rosdiagnostic/rosdiagnostic.py b/rosdiagnostic/src/rosdiagnostic/rosdiagnostic.py index 00eac1c..f020264 100755 --- a/rosdiagnostic/src/rosdiagnostic/rosdiagnostic.py +++ b/rosdiagnostic/src/rosdiagnostic/rosdiagnostic.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Software License Agreement (BSD License) # # Copyright (c) 2017, Clearpath Inc. diff --git a/self_test/scripts/test_selftest.py b/self_test/scripts/test_selftest.py index 3b6ed66..052d8b6 100755 --- a/self_test/scripts/test_selftest.py +++ b/self_test/scripts/test_selftest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Software License Agreement (BSD License) # # Copyright (c) 2010, Willow Garage, Inc. diff --git a/test_diagnostic_aggregator/test/fail_init_test.py b/test_diagnostic_aggregator/test/fail_init_test.py index e743d39..74317e6 100755 --- a/test_diagnostic_aggregator/test/fail_init_test.py +++ b/test_diagnostic_aggregator/test/fail_init_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Software License Agreement (BSD License) # # Copyright (c) 2010, Willow Garage, Inc. diff --git a/test_diagnostic_aggregator/test/match_analyze_pub.py b/test_diagnostic_aggregator/test/match_analyze_pub.py index b1f476f..faf5708 100755 --- a/test_diagnostic_aggregator/test/match_analyze_pub.py +++ b/test_diagnostic_aggregator/test/match_analyze_pub.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Software License Agreement (BSD License) # # Copyright (c) 2010, Willow Garage, Inc. diff --git a/test_diagnostic_aggregator/test/match_analyze_test.py b/test_diagnostic_aggregator/test/match_analyze_test.py index 29ae52b..6cb46e2 100755 --- a/test_diagnostic_aggregator/test/match_analyze_test.py +++ b/test_diagnostic_aggregator/test/match_analyze_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Software License Agreement (BSD License) # # Copyright (c) 2009, Willow Garage, Inc.