From 0c8a0058bf0ac6c0a52fcc71b3909ed8c3bfbb90 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 2 Sep 2021 18:30:50 -0500 Subject: [PATCH] use python3 in all #!python lines --- .../apps/gladevcp/colored-label/coloredlabel.py | 2 +- configs/apps/gladevcp/complex/complex.py | 2 +- configs/apps/gladevcp/templates/classhandler.py | 2 +- .../templates/classhandler_persistent.py | 2 +- configs/sim/axis/db_demo/db.py | 2 +- configs/sim/axis/gladevcp/probe.py | 2 +- .../python/gladevcp-handler.py | 2 +- .../axis/vismach/3axis-tutorial/3axis-tutorial | 2 +- configs/sim/axis/vismach/rolfmill/rolfmill | 2 +- configs/sim/gmoccapy/gmoccapy_plasma/plasma.py | 2 +- configs/sim/gmoccapy/gmoccapy_plasma/signals.py | 2 +- configs/sim/gmoccapy/plasma_config/plasma.py | 2 +- configs/sim/gmoccapy/plasma_config/signals.py | 2 +- .../qtvcp_experimental/lathehandler.py | 2 +- docs/src/config/ini-config.txt | 2 +- docs/src/config/ini-config_es.txt | 2 +- docs/src/config/ini_config_fr.txt | 2 +- docs/src/config/python-interface.txt | 16 ++++++++-------- docs/src/config/python-interface_es.txt | 16 ++++++++-------- docs/src/gui/GStat.txt | 6 +++--- docs/src/gui/filter_programs.txt | 2 +- docs/src/gui/qtvcp_code_snippets.txt | 2 +- docs/src/gui/qtvcp_code_snippets_es.txt | 2 +- docs/src/gui/qtvcp_custom_widgets.txt | 10 +++++----- docs/src/gui/qtvcp_custom_widgets_es.txt | 10 +++++----- docs/src/gui/vismach.txt | 4 ++-- docs/src/gui/vismach_es.txt | 4 ++-- docs/src/hal/halmodule.txt | 2 +- docs/src/hal/halmodule_es.txt | 2 +- docs/src/hal/halmodule_fr.txt | 2 +- docs/src/html-latex-images | 2 +- docs/src/image-wildcard | 2 +- docs/src/links.py | 2 +- docs/src/links_db_gen.py | 2 +- docs/src/mkpre.py | 2 +- docs/src/tooldatabase/tooldatabase.txt | 2 +- .../versa-probe/versa_probe_screen.py | 2 +- lib/python/gladevcp/calculatorwidget.py | 2 +- lib/python/gladevcp/combi_dro.py | 2 +- lib/python/gladevcp/drowidget.py | 2 +- lib/python/gladevcp/gladebuilder.py | 2 +- lib/python/gladevcp/hal_actions.py | 2 +- lib/python/gladevcp/hal_dial.py | 2 +- lib/python/gladevcp/hal_filechooser.py | 2 +- lib/python/gladevcp/hal_gremlin.py | 2 +- lib/python/gladevcp/hal_gremlin_plus.py | 2 +- lib/python/gladevcp/hal_mdihistory.py | 2 +- lib/python/gladevcp/hal_pyngcgui.py | 2 +- lib/python/gladevcp/hal_sourceview.py | 2 +- lib/python/gladevcp/iconview.py | 2 +- lib/python/gladevcp/jogwheel.py | 2 +- lib/python/gladevcp/macro_widget.py | 2 +- lib/python/gladevcp/makepins.py | 2 +- lib/python/gladevcp/offsetpage_widget.py | 2 +- lib/python/gladevcp/offsetwidget.py | 2 +- lib/python/gladevcp/overridewidget.py | 2 +- lib/python/gladevcp/persistence.py | 2 +- lib/python/gladevcp/speedcontrol.py | 2 +- lib/python/gladevcp/tooledit_widget.py | 2 +- lib/python/gladevcp/xembed.py | 2 +- lib/python/gremlin_view.py | 2 +- lib/python/hal.py | 2 +- lib/python/hal_glib.py | 2 +- lib/python/popupkeyboard.py | 2 +- lib/python/pyngcgui.py | 2 +- lib/python/qtvcp/lib/colored_formatter.py | 2 +- lib/python/qtvcp/lib/gcode_utility/facing.py | 2 +- .../qtvcp/lib/gcode_utility/hole_circle.py | 2 +- lib/python/qtvcp/lib/gcodes.py | 2 +- lib/python/qtvcp/lib/qt_vismach/mill_xyz.py | 2 +- lib/python/qtvcp/lib/qt_vismach/qt_vismach.py | 2 +- lib/python/qtvcp/lib/qt_vismach/scara.py | 2 +- lib/python/qtvcp/lib/sys_notify.py | 2 +- lib/python/qtvcp/lib/toolbar_actions.py | 2 +- lib/python/qtvcp/lib/writer/writer.py | 2 +- lib/python/qtvcp/lib/xembed.py | 2 +- lib/python/qtvcp/logger.py | 2 +- lib/python/qtvcp/plugins/actionbutton_plugin.py | 2 +- lib/python/qtvcp/plugins/basic_probe_plugin.py | 2 +- lib/python/qtvcp/plugins/camview_plugin.py | 2 +- lib/python/qtvcp/plugins/container_plugin.py | 2 +- lib/python/qtvcp/plugins/detach_tabs_plugin.py | 2 +- lib/python/qtvcp/plugins/dialog_plugin.py | 2 +- lib/python/qtvcp/plugins/graphics_plugin.py | 2 +- lib/python/qtvcp/plugins/hal_label_plugin.py | 2 +- lib/python/qtvcp/plugins/jogincrements_plugin.py | 2 +- lib/python/qtvcp/plugins/led_plugin.py | 2 +- lib/python/qtvcp/plugins/overlay_plugin.py | 2 +- lib/python/qtvcp/plugins/qtvcp_plugin.py | 2 +- lib/python/qtvcp/plugins/round_gauge_plugin.py | 2 +- .../qtvcp/plugins/round_progress_bar_plugin.py | 2 +- lib/python/qtvcp/plugins/screenoptions_plugin.py | 2 +- lib/python/qtvcp/plugins/simplewidgets_plugin.py | 2 +- lib/python/qtvcp/plugins/state_label_plugin.py | 2 +- lib/python/qtvcp/plugins/state_led_plugin.py | 2 +- .../plugins/status_adjustment_bar_plugin.py | 2 +- lib/python/qtvcp/plugins/status_label_plugin.py | 2 +- lib/python/qtvcp/plugins/status_slider_plugin.py | 2 +- lib/python/qtvcp/plugins/tab_widget_plugin.py | 2 +- lib/python/qtvcp/plugins/toolbutton_plugin.py | 2 +- lib/python/qtvcp/plugins/versa_probe_plugin.py | 2 +- .../qtvcp/plugins/virtualkeyboard_plugin.py | 2 +- lib/python/qtvcp/plugins/widgets_plugin.py | 2 +- lib/python/qtvcp/qt_makepins.py | 2 +- lib/python/qtvcp/qt_pstat.py | 2 +- lib/python/qtvcp/qt_tstat.py | 2 +- lib/python/qtvcp/widgets/calculator.py | 2 +- lib/python/qtvcp/widgets/fake_status.py | 2 +- lib/python/qtvcp/widgets/file_manager.py | 2 +- lib/python/qtvcp/widgets/gcode_editor.py | 2 +- lib/python/qtvcp/widgets/gcode_graphics.py | 2 +- lib/python/qtvcp/widgets/general_hal_input.py | 2 +- lib/python/qtvcp/widgets/general_hal_output.py | 2 +- lib/python/qtvcp/widgets/hal_label.py | 2 +- lib/python/qtvcp/widgets/image_switcher.py | 2 +- lib/python/qtvcp/widgets/jog_increments.py | 2 +- lib/python/qtvcp/widgets/led_widget.py | 2 +- lib/python/qtvcp/widgets/macro_widget.py | 2 +- lib/python/qtvcp/widgets/nurbs_editor.py | 2 +- lib/python/qtvcp/widgets/overlay_widget.py | 2 +- lib/python/qtvcp/widgets/qtvcp_icons.py | 2 +- lib/python/qtvcp/widgets/radio_axis_selector.py | 2 +- lib/python/qtvcp/widgets/richtext_selector.py | 2 +- lib/python/qtvcp/widgets/round_gauge.py | 2 +- lib/python/qtvcp/widgets/screen_options.py | 2 +- lib/python/qtvcp/widgets/state_label.py | 2 +- lib/python/qtvcp/widgets/state_led.py | 2 +- lib/python/qtvcp/widgets/status_label.py | 2 +- lib/python/qtvcp/widgets/status_stacked.py | 2 +- lib/python/qtvcp/widgets/stylesheeteditor.py | 2 +- lib/python/qtvcp/widgets/widget_switcher.py | 2 +- lib/python/qtvcp/widgets/xembed.py | 2 +- lib/python/rs274/OpenGLTk.py | 2 +- lib/python/rs274/options.py | 2 +- scripts/decode_dmesg | 2 +- scripts/torture.py | 2 +- src/emc/usr_intf/axis/scripts/debuglevel.py | 2 +- .../axis/scripts/hal_manualtoolchange.py | 2 +- src/emc/usr_intf/axis/scripts/image-to-gcode.py | 2 +- src/emc/usr_intf/axis/scripts/lintini.py | 2 +- src/emc/usr_intf/axis/scripts/mdi.py | 2 +- src/emc/usr_intf/axis/scripts/teach-in.py | 2 +- src/emc/usr_intf/axis/scripts/tracking-test.py | 2 +- src/emc/usr_intf/gmoccapy/dialogs.py | 2 +- src/emc/usr_intf/gmoccapy/getiniinfo.py | 2 +- src/emc/usr_intf/gmoccapy/gmoccapy.py | 2 +- src/emc/usr_intf/gmoccapy/notification.py | 2 +- src/emc/usr_intf/gmoccapy/player.py | 2 +- src/emc/usr_intf/gmoccapy/widgets.py | 2 +- src/emc/usr_intf/gremlin/gremlin-run | 2 +- src/emc/usr_intf/gremlin/gremlin.py | 2 +- src/emc/usr_intf/gscreen/gscreen.py | 2 +- src/emc/usr_intf/pncconf/build_HAL.py | 2 +- src/emc/usr_intf/pncconf/data.py | 2 +- src/emc/usr_intf/pncconf/pages.py | 2 +- src/emc/usr_intf/pncconf/pncconf.py | 2 +- src/emc/usr_intf/pncconf/private_data.py | 2 +- src/emc/usr_intf/pncconf/tests.py | 2 +- src/emc/usr_intf/pyui/pyui.py | 2 +- src/emc/usr_intf/qtvcp/qtvcp.py | 2 +- src/emc/usr_intf/stepconf/build_HAL.py | 2 +- src/emc/usr_intf/stepconf/build_INI.py | 2 +- src/emc/usr_intf/stepconf/import_mach.py | 2 +- src/emc/usr_intf/stepconf/pages.py | 2 +- src/emc/usr_intf/stepconf/stepconf.py | 2 +- src/emc/usr_intf/touchy/touchy.py | 2 +- src/hal/user_comps/gladevcp.py | 2 +- src/hal/user_comps/hal_input.py | 2 +- src/hal/user_comps/mitsub_vfd.py | 2 +- src/hal/user_comps/pyvcp.py | 2 +- src/hal/user_comps/scorbot-er-3.py | 2 +- src/hal/user_comps/vismach/5axisgui.py | 2 +- src/hal/user_comps/vismach/hbmgui.py | 2 +- src/hal/user_comps/vismach/hexagui.py | 2 +- src/hal/user_comps/vismach/lineardelta.py | 2 +- src/hal/user_comps/vismach/maho600gui.py | 2 +- src/hal/user_comps/vismach/max5gui.py | 2 +- src/hal/user_comps/vismach/melfagui.py | 2 +- src/hal/user_comps/vismach/millturngui.py | 2 +- src/hal/user_comps/vismach/puma560gui.py | 2 +- src/hal/user_comps/vismach/pumagui.py | 2 +- src/hal/user_comps/vismach/rotarydelta.py | 2 +- src/hal/user_comps/vismach/scaragui.py | 2 +- src/hal/user_comps/vismach/xyzac-trt-gui.py | 2 +- src/hal/user_comps/vismach/xyzbc-trt-gui.py | 2 +- src/hal/utils/elbpcom.py | 2 +- src/hal/utils/halcompile.g | 2 +- src/modsilent.py | 2 +- src/po/fixpaths.py | 2 +- tests/abort/feed-rate/test-ui.py | 2 +- tests/abort/g64/test-ui.py | 2 +- .../abort/on_abort_command-crazy-move/test-ui.py | 2 +- tests/abort/stop-button-crazy-move/test-ui.py | 2 +- tests/ccomp/early-exit/test-ui.py | 2 +- tests/hal-link-unlink/hallink.py | 2 +- tests/halmodule.0/test.py | 2 +- tests/halmodule.1/stream_reader.py | 2 +- tests/halmodule.1/stream_test.py | 2 +- tests/halmodule.1/stream_writer.py | 2 +- tests/halui/jogging/test-ui.py | 2 +- tests/halui/mdi/test-ui.py | 2 +- tests/hard-limits/test-ui.py | 2 +- tests/hm2-idrom/check-dmesg.py | 2 +- tests/interp/bad/test | 2 +- tests/interp/good/test | 2 +- .../12-M99-endless-main-program/test-ui.py | 2 +- tests/interp/mdi-oword-m66/test-ui.py | 2 +- tests/interp/oword-mdi-sub-update/test-ui.py | 2 +- tests/interp/python/error/canon.py | 2 +- tests/interp/subroutine-return/test-ui.py | 2 +- tests/io-startup/test-ui.py | 2 +- tests/lathe/test-ui.py | 2 +- tests/limit3/checkresult | 2 +- tests/limit3/sunny-day/checkresult | 2 +- tests/mdi-queue-length/test-ui.py | 2 +- tests/mdi-while-queuebuster-waitflag/remap.py | 2 +- tests/mdi-while-queuebuster-waitflag/test-ui.py | 2 +- tests/mdi-while-queuebuster-waitflag/toplevel.py | 2 +- tests/motion-logger/basic/test-ui.py | 2 +- tests/motion-logger/mountaindew/test-ui.py | 2 +- .../motion-logger/startup-gcode-abort/test-ui.py | 2 +- tests/motion/g0/checkresult | 2 +- tests/motion/jogwheel-axis/test-ui.py | 2 +- tests/motion/jogwheel-joint/test-ui.py | 2 +- tests/pyhal/test | 2 +- tests/remap/remap-io/test-ui.py | 2 +- tests/remap/remap-io/toplevel.py | 2 +- tests/remap/remap-reentry/toplevel.py | 2 +- tests/remap/sequencing/permute.py | 2 +- tests/rs274ngc-startup/test-ui.py | 2 +- tests/single-step/test-ui.py | 2 +- tests/startup-state/test-ui.py | 2 +- tests/statbuffer-g5x-abort/test-ui.py | 2 +- tests/threads.0/checkresult | 2 +- tests/tlo/test-ui.py | 2 +- tests/tool-info/non-random/test-ui.py | 2 +- .../tool-info/random-no-startup-tool/test-ui.py | 2 +- .../random-with-startup-tool/test-ui.py | 2 +- tests/toolchanger/m61/test-ui.py | 2 +- .../reload-tool/non-random/test-ui.py | 2 +- tests/toolchanger/reload-tool/random/test-ui.py | 2 +- .../circular-arcs/linuxcnc_control.py | 2 +- .../circular-arcs/machine_setup.py | 2 +- .../circular-arcs/run_all_tests.py | 2 +- 244 files changed, 270 insertions(+), 270 deletions(-) diff --git a/configs/apps/gladevcp/colored-label/coloredlabel.py b/configs/apps/gladevcp/colored-label/coloredlabel.py index 1948a6a2120..42f119ca416 100644 --- a/configs/apps/gladevcp/colored-label/coloredlabel.py +++ b/configs/apps/gladevcp/colored-label/coloredlabel.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et # This is a component of LinuxCNC # complex.py Copyright 2011 Michael Haberler diff --git a/configs/apps/gladevcp/complex/complex.py b/configs/apps/gladevcp/complex/complex.py index 220e0955147..67b2693f69b 100644 --- a/configs/apps/gladevcp/complex/complex.py +++ b/configs/apps/gladevcp/complex/complex.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et # This is a component of LinuxCNC # complex.py Copyright 2010 Michael Haberler diff --git a/configs/apps/gladevcp/templates/classhandler.py b/configs/apps/gladevcp/templates/classhandler.py index 12c39d255d3..f58ec9ddc03 100644 --- a/configs/apps/gladevcp/templates/classhandler.py +++ b/configs/apps/gladevcp/templates/classhandler.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et # This is a component of LinuxCNC # classhandler.py Copyright 2010 Michael Haberler diff --git a/configs/apps/gladevcp/templates/classhandler_persistent.py b/configs/apps/gladevcp/templates/classhandler_persistent.py index 18aa76ebcf8..edec9eb258b 100644 --- a/configs/apps/gladevcp/templates/classhandler_persistent.py +++ b/configs/apps/gladevcp/templates/classhandler_persistent.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et # This is a component of LinuxCNC # classhandler_persistent.py Copyright 2010 Michael Haberler diff --git a/configs/sim/axis/db_demo/db.py b/configs/sim/axis/db_demo/db.py index f19854c3a9c..cbbcf63e062 100755 --- a/configs/sim/axis/db_demo/db.py +++ b/configs/sim/axis/db_demo/db.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Demonstrate LinuxCNC interface for a database of tools diff --git a/configs/sim/axis/gladevcp/probe.py b/configs/sim/axis/gladevcp/probe.py index 8c4902dc82e..fcca3592815 100644 --- a/configs/sim/axis/gladevcp/probe.py +++ b/configs/sim/axis/gladevcp/probe.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et # This is a component of Linuxcnc # probe.py Copyright 2010 Michael Haberler diff --git a/configs/sim/axis/remap/manual-toolchange-with-tool-length-switch/python/gladevcp-handler.py b/configs/sim/axis/remap/manual-toolchange-with-tool-length-switch/python/gladevcp-handler.py index 5a04dbff5ff..56d695a103d 100644 --- a/configs/sim/axis/remap/manual-toolchange-with-tool-length-switch/python/gladevcp-handler.py +++ b/configs/sim/axis/remap/manual-toolchange-with-tool-length-switch/python/gladevcp-handler.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import hal diff --git a/configs/sim/axis/vismach/3axis-tutorial/3axis-tutorial b/configs/sim/axis/vismach/3axis-tutorial/3axis-tutorial index b87dadae8e6..2b374b9bd12 100755 --- a/configs/sim/axis/vismach/3axis-tutorial/3axis-tutorial +++ b/configs/sim/axis/vismach/3axis-tutorial/3axis-tutorial @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python3 # Rolf Redford, Nov 2018 diff --git a/configs/sim/axis/vismach/rolfmill/rolfmill b/configs/sim/axis/vismach/rolfmill/rolfmill index ce1fe1759a8..73044819a4a 100755 --- a/configs/sim/axis/vismach/rolfmill/rolfmill +++ b/configs/sim/axis/vismach/rolfmill/rolfmill @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python3 #import libraries from vismach import * diff --git a/configs/sim/gmoccapy/gmoccapy_plasma/plasma.py b/configs/sim/gmoccapy/gmoccapy_plasma/plasma.py index 4f68d198bf1..e2b451b9425 100644 --- a/configs/sim/gmoccapy/gmoccapy_plasma/plasma.py +++ b/configs/sim/gmoccapy/gmoccapy_plasma/plasma.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding:UTF-8 -*- """ This file will control some options of the gmoccapy plasma screen diff --git a/configs/sim/gmoccapy/gmoccapy_plasma/signals.py b/configs/sim/gmoccapy/gmoccapy_plasma/signals.py index abbab743dcb..ede2578efa0 100644 --- a/configs/sim/gmoccapy/gmoccapy_plasma/signals.py +++ b/configs/sim/gmoccapy/gmoccapy_plasma/signals.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding:UTF-8 -*- """ This file will control some options of the gmoccapy plasma screen diff --git a/configs/sim/gmoccapy/plasma_config/plasma.py b/configs/sim/gmoccapy/plasma_config/plasma.py index 4f68d198bf1..e2b451b9425 100644 --- a/configs/sim/gmoccapy/plasma_config/plasma.py +++ b/configs/sim/gmoccapy/plasma_config/plasma.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding:UTF-8 -*- """ This file will control some options of the gmoccapy plasma screen diff --git a/configs/sim/gmoccapy/plasma_config/signals.py b/configs/sim/gmoccapy/plasma_config/signals.py index abbab743dcb..ede2578efa0 100644 --- a/configs/sim/gmoccapy/plasma_config/signals.py +++ b/configs/sim/gmoccapy/plasma_config/signals.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding:UTF-8 -*- """ This file will control some options of the gmoccapy plasma screen diff --git a/configs/sim/qtvcp_screens/qtvcp_experimental/lathehandler.py b/configs/sim/qtvcp_screens/qtvcp_experimental/lathehandler.py index ca3aa07031a..a2b0f04f4f0 100644 --- a/configs/sim/qtvcp_screens/qtvcp_experimental/lathehandler.py +++ b/configs/sim/qtvcp_screens/qtvcp_experimental/lathehandler.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et # This is a component of EMC # savestate.py copyright 2013 Andy Pugh diff --git a/docs/src/config/ini-config.txt b/docs/src/config/ini-config.txt index 53ada3cfc23..9c7d4ec6fa5 100644 --- a/docs/src/config/ini-config.txt +++ b/docs/src/config/ini-config.txt @@ -511,7 +511,7 @@ This example program filters a file and adds a W axis to match the Z axis. It depends on there being a space between each axis word to work. ---- -#!/usr/bin/env python +#!/usr/bin/env python3 import sys diff --git a/docs/src/config/ini-config_es.txt b/docs/src/config/ini-config_es.txt index f1a9fc38ff5..357ba1115bf 100644 --- a/docs/src/config/ini-config_es.txt +++ b/docs/src/config/ini-config_es.txt @@ -489,7 +489,7 @@ Este programa de ejemplo filtra un archivo y agrega un eje W para que coincida c Depende de que haya un espacio entre cada palabra de eje para trabajar. ---- -#!/usr/bin/env python +#!/usr/bin/env python3 import sys diff --git a/docs/src/config/ini_config_fr.txt b/docs/src/config/ini_config_fr.txt index 863cd334d5c..d21c189817b 100644 --- a/docs/src/config/ini_config_fr.txt +++ b/docs/src/config/ini_config_fr.txt @@ -546,7 +546,7 @@ Cet exemple de programme filtre un fichier et ajoute un axe W correspondant à l'axe Z. Il marchera selon la présence d'un espace entre chaque mot d'axe. ---- -#!/usr/bin/env python +#!/usr/bin/env python3 import sys diff --git a/docs/src/config/python-interface.txt b/docs/src/config/python-interface.txt index c9d11ca2adb..84170c2ec64 100644 --- a/docs/src/config/python-interface.txt +++ b/docs/src/config/python-interface.txt @@ -61,7 +61,7 @@ linuxcnc is running for typical values): [source,python] --------------------------------------------------------------------- -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import sys import linuxcnc @@ -376,7 +376,7 @@ are integers and the rest are floats. [source,python] ---- -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import linuxcnc s = linuxcnc.stat() @@ -399,7 +399,7 @@ of a particular axis: [source,python] --------------------------------------------------------------------- -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import linuxcnc s = linuxcnc.stat() @@ -548,7 +548,7 @@ so an appropriate test before sending an MDI command through [source,python] --------------------------------------------------------------------- -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import linuxcnc s = linuxcnc.stat() @@ -570,7 +570,7 @@ Before sending a command, initialize a command channel like so: [source,python] --------------------------------------------------------------------- -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import linuxcnc c = linuxcnc.command() @@ -750,7 +750,7 @@ c.tool_offset(toolno, z_offset, x_offset, diameter, frontangle, backangle, orie [source, python] --------------------------------------------------------------------- -#!/usr/bin/env python +#!/usr/bin/env python3 import linuxcnc c = linuxcnc.command() @@ -819,7 +819,7 @@ one error channel reader task in a setup. [source,python] --------------------------------------------------------------------- -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import linuxcnc e = linuxcnc.error_channel() @@ -843,7 +843,7 @@ Here's an example for reading values from an ini file through the [source,python] --------------------------------------------------------------------- -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # run as: # python ini-example.py ~/emc2-dev/configs/sim/axis/axis_mm.ini diff --git a/docs/src/config/python-interface_es.txt b/docs/src/config/python-interface_es.txt index a95b1efa566..976345aeba3 100644 --- a/docs/src/config/python-interface_es.txt +++ b/docs/src/config/python-interface_es.txt @@ -63,7 +63,7 @@ linuxcnc se está ejecutando para valores típicos): [source,python] --------------------------------------------------------------------- -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import sys import linuxcnc @@ -375,7 +375,7 @@ son enteros y el resto son floats. [source,python] ---- -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import linuxcnc s = linuxcnc.stat() @@ -398,7 +398,7 @@ de un eje particular: [source,python] --------------------------------------------------------------------- -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import linuxcnc s = linuxcnc.stat() @@ -547,7 +547,7 @@ entonces una prueba apropiada antes de enviar un comando MDI a través de [source,python] --------------------------------------------------------------------- -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import linuxcnc s = linuxcnc.stat() @@ -569,7 +569,7 @@ Antes de enviar un comando, inicialice un canal de comando así: [source,python] --------------------------------------------------------------------- -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import linuxcnc c = linuxcnc.command() @@ -739,7 +739,7 @@ c.tool_offset(toolno, z_offset, x_offset, diameter, frontangle, backangle, orie [source, python] --------------------------------------------------------------------- -#!/usr/bin/env python +#!/usr/bin/env python3 import linuxcnc c = linuxcnc.command() @@ -807,7 +807,7 @@ una tarea de lector de canal de error en una configuración. [source,python] --------------------------------------------------------------------- -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import linuxcnc e = linuxcnc.error_channel() @@ -831,7 +831,7 @@ objeto `linuxcnc.ini`: [source,python] --------------------------------------------------------------------- -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # run as: # python ini-example.py ~/emc2-dev/configs/sim/axis/axis_mm.ini diff --git a/docs/src/gui/GStat.txt b/docs/src/gui/GStat.txt index f20071d8a2b..e087ffbf638 100644 --- a/docs/src/gui/GStat.txt +++ b/docs/src/gui/GStat.txt @@ -49,7 +49,7 @@ of G20/G21. [source,python] ---- -#!/usr/bin/env python +#!/usr/bin/env python3 import hal from hal_glib import GStat @@ -93,7 +93,7 @@ This file assumes there are three GTK labels named: + [source,python] ---- -#!/usr/bin/env python +#!/usr/bin/env python3 from hal_glib import GStat GSTAT = GStat() @@ -134,7 +134,7 @@ This handler file assumes there are three QLabels named: + 'interp_state_label' + [source,python] ---- -#!/usr/bin/env python +#!/usr/bin/env python3 from qtvcp.core import Status GSTAT = Status() diff --git a/docs/src/gui/filter_programs.txt b/docs/src/gui/filter_programs.txt index ea90844e2b6..8203f4f6918 100644 --- a/docs/src/gui/filter_programs.txt +++ b/docs/src/gui/filter_programs.txt @@ -86,7 +86,7 @@ Then it reads the program line by line and passes it to standard output. + As it does along it updates any process listening to standard error output' [source,python] ---- -#!/usr/bin/python +#!/usr/bin/env python3 import sys import os diff --git a/docs/src/gui/qtvcp_code_snippets.txt b/docs/src/gui/qtvcp_code_snippets.txt index 94f770d6c10..a9e4971e651 100644 --- a/docs/src/gui/qtvcp_code_snippets.txt +++ b/docs/src/gui/qtvcp_code_snippets.txt @@ -591,7 +591,7 @@ Run this in a separate terminal from linuxcnc to see the sent messages. + [source,python] ---- -#!/usr/bin/env python +#!/usr/bin/env python3 from time import sleep import zmq diff --git a/docs/src/gui/qtvcp_code_snippets_es.txt b/docs/src/gui/qtvcp_code_snippets_es.txt index abd2dcb2a2d..e620af1f845 100644 --- a/docs/src/gui/qtvcp_code_snippets_es.txt +++ b/docs/src/gui/qtvcp_code_snippets_es.txt @@ -504,7 +504,7 @@ Run this in a separate terminal from linuxcnc to see the sent messages. + [source,python] ---- -#!/usr/bin/env python +#!/usr/bin/env python3 from time import sleep import zmq diff --git a/docs/src/gui/qtvcp_custom_widgets.txt b/docs/src/gui/qtvcp_custom_widgets.txt index 7c1abd77e6f..e00d8220d01 100644 --- a/docs/src/gui/qtvcp_custom_widgets.txt +++ b/docs/src/gui/qtvcp_custom_widgets.txt @@ -32,7 +32,7 @@ Lets look at a snippet of simple_widgets.py. + [source,python] ---- -#!/usr/bin/python3 +#!/usr/bin/env python3 ############################### # Imports @@ -94,7 +94,7 @@ This LED indicator widget will respond to selectable linuxcnc controller states. [source,python] ---- -#!/usr/bin/python3 +#!/usr/bin/env python3 ############################### # Imports @@ -476,7 +476,7 @@ to import them. + ---- -#!/usr/bin/env python +#!/usr/bin/env python3 from PyQt5 import QtCore, QtGui from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin @@ -521,7 +521,7 @@ class LcncGridLayoutPlugin(QPyDesignerCustomWidgetPlugin): [source,python] ---- -#!/usr/bin/env python +#!/usr/bin/env python3 from PyQt5 import QtCore, QtGui from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin @@ -569,7 +569,7 @@ in a more convenient way. This is the plugin used for action buttons. + [source,python] ---- -#!/usr/bin/env python +#!/usr/bin/env python3 import sip from PyQt5 import QtCore, QtGui, QtWidgets diff --git a/docs/src/gui/qtvcp_custom_widgets_es.txt b/docs/src/gui/qtvcp_custom_widgets_es.txt index 8cacec33805..84ff5c003d7 100644 --- a/docs/src/gui/qtvcp_custom_widgets_es.txt +++ b/docs/src/gui/qtvcp_custom_widgets_es.txt @@ -32,7 +32,7 @@ Lets look at a snippet of simple_widgets.py. + [source,python] ---- -#!/usr/bin/python3 +#!/usr/bin/env python3 ############################### # Imports @@ -94,7 +94,7 @@ This LED indicator widget will respond to selectable linuxcnc controller states. [source,python] ---- -#!/usr/bin/python3 +#!/usr/bin/env python3 ############################### # Imports @@ -396,7 +396,7 @@ to import them. + [source,python] ---- -#!/usr/bin/env python +#!/usr/bin/env python3 from PyQt5 import QtCore, QtGui from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin @@ -441,7 +441,7 @@ class LcncGridLayoutPlugin(QPyDesignerCustomWidgetPlugin): [source,python] ---- -#!/usr/bin/env python +#!/usr/bin/env python3 from PyQt5 import QtCore, QtGui from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin @@ -489,7 +489,7 @@ in a more convenient way. This is the plugin used for action buttons. + [source,python] ---- -#!/usr/bin/env python +#!/usr/bin/env python3 import sip from PyQt5 import QtCore, QtGui, QtWidgets diff --git a/docs/src/gui/vismach.txt b/docs/src/gui/vismach.txt index eb607c47452..0d8afd6fba2 100644 --- a/docs/src/gui/vismach.txt +++ b/docs/src/gui/vismach.txt @@ -33,12 +33,12 @@ The basic sequence in creating the Vismach model is == Start the script -It is useful for testing to include the '#!/usr/bin/env python' to allow the file +It is useful for testing to include the '#!/usr/bin/env python3' to allow the file to be run as a script. The first thing to do is to import the required libraries. ---- -#!/usr/bin/env python +#!/usr/bin/env python3 from vismach import * import hal diff --git a/docs/src/gui/vismach_es.txt b/docs/src/gui/vismach_es.txt index 18fb19fc694..3f750ec4fae 100644 --- a/docs/src/gui/vismach_es.txt +++ b/docs/src/gui/vismach_es.txt @@ -33,12 +33,12 @@ The basic sequence in creating the Vismach model is == Start the script -It is useful for testing to include the '#!/usr/bin/env python' to allow the file +It is useful for testing to include the '#!/usr/bin/env python3' to allow the file to be run as a script. The first thing to do is to import the required libraries. ---- -#!/usr/bin/env python +#!/usr/bin/env python3 from vismach import * import hal diff --git a/docs/src/hal/halmodule.txt b/docs/src/hal/halmodule.txt index b44e2a52e99..e88c8f05445 100644 --- a/docs/src/hal/halmodule.txt +++ b/docs/src/hal/halmodule.txt @@ -12,7 +12,7 @@ once per second. [source,c] ---- -#!/usr/bin/env python +#!/usr/bin/env python3 import hal, time h = hal.component("passthrough") h.newpin("in", hal.HAL_FLOAT, hal.HAL_IN) diff --git a/docs/src/hal/halmodule_es.txt b/docs/src/hal/halmodule_es.txt index c3a3d82a446..930b5f2d621 100644 --- a/docs/src/hal/halmodule_es.txt +++ b/docs/src/hal/halmodule_es.txt @@ -14,7 +14,7 @@ una vez por segundo. [source,c] ---- -#!/usr/bin/env python +#!/usr/bin/env python3 import hal, time h = hal.component("passthrough") h.newpin("in", hal.HAL_FLOAT, hal.HAL_IN) diff --git a/docs/src/hal/halmodule_fr.txt b/docs/src/hal/halmodule_fr.txt index 74089384294..8805eae408e 100644 --- a/docs/src/hal/halmodule_fr.txt +++ b/docs/src/hal/halmodule_fr.txt @@ -12,7 +12,7 @@ entrées. Le composant suivant, un passe-tout, copie la valeur vue sur ses pins d'entrée (_passe_tout.in_) vers ses pins de sortie (_passe_tout.out_) approximativement une fois par seconde. ---- -#!/usr/bin/env python +#!/usr/bin/env python3 import hal, time h = hal.component("passe_tout") h.newpin("in", hal.HAL_FLOAT, hal.HAL_IN) diff --git a/docs/src/html-latex-images b/docs/src/html-latex-images index fdfba7851b6..cb7ecc95f21 100755 --- a/docs/src/html-latex-images +++ b/docs/src/html-latex-images @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et import os, shutil, sys, subprocess diff --git a/docs/src/image-wildcard b/docs/src/image-wildcard index f913fc090ff..dadbca6b256 100755 --- a/docs/src/image-wildcard +++ b/docs/src/image-wildcard @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import os, sys, glob diff --git a/docs/src/links.py b/docs/src/links.py index b3c42425f46..41e9430b3e2 100755 --- a/docs/src/links.py +++ b/docs/src/links.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et import os, sys diff --git a/docs/src/links_db_gen.py b/docs/src/links_db_gen.py index c4c814be50c..b32fddab62f 100755 --- a/docs/src/links_db_gen.py +++ b/docs/src/links_db_gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import os, sys d = {} diff --git a/docs/src/mkpre.py b/docs/src/mkpre.py index 46a904c238e..11e90ecf124 100755 --- a/docs/src/mkpre.py +++ b/docs/src/mkpre.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 """mkpre.py: Convert ASCII art into something that groff can render to text, HTML, or postscript/pdf diff --git a/docs/src/tooldatabase/tooldatabase.txt b/docs/src/tooldatabase/tooldatabase.txt index 1a306152763..dff16f40337 100644 --- a/docs/src/tooldatabase/tooldatabase.txt +++ b/docs/src/tooldatabase/tooldatabase.txt @@ -102,7 +102,7 @@ reload operation is typically provided by the gui but on-demand reloads can be done with a USER_M command. Example: ---- -#!/usr/bin/python +#!/usr/bin/env python3 from linuxcnc import command command().load_tool_table() ---- diff --git a/lib/python/gladevcp/builtin-panels/versa-probe/versa_probe_screen.py b/lib/python/gladevcp/builtin-panels/versa-probe/versa_probe_screen.py index 96f573096db..62e67240c01 100644 --- a/lib/python/gladevcp/builtin-panels/versa-probe/versa_probe_screen.py +++ b/lib/python/gladevcp/builtin-panels/versa-probe/versa_probe_screen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (c) 2015 Serguei Glavatski ( verser from cnc-club.ru ) # diff --git a/lib/python/gladevcp/calculatorwidget.py b/lib/python/gladevcp/calculatorwidget.py index 85ab0d7f60d..9fd36a86bd1 100644 --- a/lib/python/gladevcp/calculatorwidget.py +++ b/lib/python/gladevcp/calculatorwidget.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # GladeVcp Widget - calculator input # This widgets allows simple calculations. # The result can be returned for further use. diff --git a/lib/python/gladevcp/combi_dro.py b/lib/python/gladevcp/combi_dro.py index cc2b5fb83e3..c1d6b76cc2b 100644 --- a/lib/python/gladevcp/combi_dro.py +++ b/lib/python/gladevcp/combi_dro.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # GladeVcp Widget - DRO widget, showing all 3 reference types # This widgets displays linuxcnc axis position information. diff --git a/lib/python/gladevcp/drowidget.py b/lib/python/gladevcp/drowidget.py index ea73c2abf62..0bea175d1f9 100644 --- a/lib/python/gladevcp/drowidget.py +++ b/lib/python/gladevcp/drowidget.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # GladeVcp Widget - DRO label widget # This widgets displays linuxcnc axis position information. # diff --git a/lib/python/gladevcp/gladebuilder.py b/lib/python/gladevcp/gladebuilder.py index 2ee0359f5a5..8e59ed74a3a 100644 --- a/lib/python/gladevcp/gladebuilder.py +++ b/lib/python/gladevcp/gladebuilder.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et import gi diff --git a/lib/python/gladevcp/hal_actions.py b/lib/python/gladevcp/hal_actions.py index 6340f6bca76..8d64f9caf03 100644 --- a/lib/python/gladevcp/hal_actions.py +++ b/lib/python/gladevcp/hal_actions.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et # GladeVcp actions # diff --git a/lib/python/gladevcp/hal_dial.py b/lib/python/gladevcp/hal_dial.py index 93f49f38c5a..697be1bacf7 100644 --- a/lib/python/gladevcp/hal_dial.py +++ b/lib/python/gladevcp/hal_dial.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # hal_dial.py # a pygtk widget that implements a dial with HAL pins diff --git a/lib/python/gladevcp/hal_filechooser.py b/lib/python/gladevcp/hal_filechooser.py index cdf718554a6..8c3336751ba 100644 --- a/lib/python/gladevcp/hal_filechooser.py +++ b/lib/python/gladevcp/hal_filechooser.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et # GladeVcp FileChooser related widgets # diff --git a/lib/python/gladevcp/hal_gremlin.py b/lib/python/gladevcp/hal_gremlin.py index 03a41a8f652..21a7dfe141d 100644 --- a/lib/python/gladevcp/hal_gremlin.py +++ b/lib/python/gladevcp/hal_gremlin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et # GladeVcp Widgets # diff --git a/lib/python/gladevcp/hal_gremlin_plus.py b/lib/python/gladevcp/hal_gremlin_plus.py index 86bf2478e2d..3b6705a5f55 100644 --- a/lib/python/gladevcp/hal_gremlin_plus.py +++ b/lib/python/gladevcp/hal_gremlin_plus.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #------------------------------------------------------------------------------ # Copyright: 2013 diff --git a/lib/python/gladevcp/hal_mdihistory.py b/lib/python/gladevcp/hal_mdihistory.py index ac8e9423d0e..4f22fc7c90c 100644 --- a/lib/python/gladevcp/hal_mdihistory.py +++ b/lib/python/gladevcp/hal_mdihistory.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et # GladeVcp MDI history widget # diff --git a/lib/python/gladevcp/hal_pyngcgui.py b/lib/python/gladevcp/hal_pyngcgui.py index b3ac23ca967..80fedc41a9c 100644 --- a/lib/python/gladevcp/hal_pyngcgui.py +++ b/lib/python/gladevcp/hal_pyngcgui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #------------------------------------------------------------------------------ # Copyright: 2013 diff --git a/lib/python/gladevcp/hal_sourceview.py b/lib/python/gladevcp/hal_sourceview.py index 9715f05e095..5fee356eeca 100644 --- a/lib/python/gladevcp/hal_sourceview.py +++ b/lib/python/gladevcp/hal_sourceview.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et # GladeVcp actions # diff --git a/lib/python/gladevcp/iconview.py b/lib/python/gladevcp/iconview.py index b8500d90cee..8479c061ab2 100755 --- a/lib/python/gladevcp/iconview.py +++ b/lib/python/gladevcp/iconview.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 ''' This IconView widget shows the contents of the currently selected diff --git a/lib/python/gladevcp/jogwheel.py b/lib/python/gladevcp/jogwheel.py index 24a9f335510..e6bf2669b81 100644 --- a/lib/python/gladevcp/jogwheel.py +++ b/lib/python/gladevcp/jogwheel.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # GladeVcp Widget # JogWheel widget, to simulate a real jogwheel diff --git a/lib/python/gladevcp/macro_widget.py b/lib/python/gladevcp/macro_widget.py index 0c378e67363..69d20be7b42 100644 --- a/lib/python/gladevcp/macro_widget.py +++ b/lib/python/gladevcp/macro_widget.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et # GladeVcp Macro widget # diff --git a/lib/python/gladevcp/makepins.py b/lib/python/gladevcp/makepins.py index e7624ee7fa1..3f2174a7b2b 100644 --- a/lib/python/gladevcp/makepins.py +++ b/lib/python/gladevcp/makepins.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- encoding: utf-8 -*- # GLADE_VCP # Copyright 2010 Chris Morley diff --git a/lib/python/gladevcp/offsetpage_widget.py b/lib/python/gladevcp/offsetpage_widget.py index eaf0f947869..2d218685af9 100755 --- a/lib/python/gladevcp/offsetpage_widget.py +++ b/lib/python/gladevcp/offsetpage_widget.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # GladeVcp Widget - offsetpage # # Copyright (c) 2013 Chris Morley diff --git a/lib/python/gladevcp/offsetwidget.py b/lib/python/gladevcp/offsetwidget.py index 9152cf7214c..2c8dc8ef146 100644 --- a/lib/python/gladevcp/offsetwidget.py +++ b/lib/python/gladevcp/offsetwidget.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # GladeVcp Widget - DRO label widget # This widgets displays linuxcnc axis position information. # diff --git a/lib/python/gladevcp/overridewidget.py b/lib/python/gladevcp/overridewidget.py index 9f8a51c271c..b43b0739e4a 100644 --- a/lib/python/gladevcp/overridewidget.py +++ b/lib/python/gladevcp/overridewidget.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # GladeVcp Widget - override widget # This widgets controls linuxcnc's override rate # diff --git a/lib/python/gladevcp/persistence.py b/lib/python/gladevcp/persistence.py index ec1df1d8620..5435c1116ac 100644 --- a/lib/python/gladevcp/persistence.py +++ b/lib/python/gladevcp/persistence.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et # This is a component of EMC # util.py Copyright 2010 Michael Haberler diff --git a/lib/python/gladevcp/speedcontrol.py b/lib/python/gladevcp/speedcontrol.py index bccdd7abfa4..3152263315d 100755 --- a/lib/python/gladevcp/speedcontrol.py +++ b/lib/python/gladevcp/speedcontrol.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding:UTF-8 -*- # GladeVcp Widget diff --git a/lib/python/gladevcp/tooledit_widget.py b/lib/python/gladevcp/tooledit_widget.py index 43a9471b2ac..8cd48e6289b 100644 --- a/lib/python/gladevcp/tooledit_widget.py +++ b/lib/python/gladevcp/tooledit_widget.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # GladeVcp Widget - tooledit # # Copyright (c) 2012 Chris Morley diff --git a/lib/python/gladevcp/xembed.py b/lib/python/gladevcp/xembed.py index bbf4214f7d3..00227bb1011 100644 --- a/lib/python/gladevcp/xembed.py +++ b/lib/python/gladevcp/xembed.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et """ XEmbed helper functions to allow correct embeding inside Axis diff --git a/lib/python/gremlin_view.py b/lib/python/gremlin_view.py index 6f0c02ccb5e..387371a1345 100644 --- a/lib/python/gremlin_view.py +++ b/lib/python/gremlin_view.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #------------------------------------------------------------------------------ # Copyright: 2013 diff --git a/lib/python/hal.py b/lib/python/hal.py index 2d8a3651e11..9039233c630 100644 --- a/lib/python/hal.py +++ b/lib/python/hal.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et """ diff --git a/lib/python/hal_glib.py b/lib/python/hal_glib.py index 655923ff20f..24659a6e6f8 100644 --- a/lib/python/hal_glib.py +++ b/lib/python/hal_glib.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et import _hal, hal diff --git a/lib/python/popupkeyboard.py b/lib/python/popupkeyboard.py index 2b3e68102c0..a53b8dd79db 100755 --- a/lib/python/popupkeyboard.py +++ b/lib/python/popupkeyboard.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #------------------------------------------------------------------------------ # Copyright: 2013 diff --git a/lib/python/pyngcgui.py b/lib/python/pyngcgui.py index 659e21bf2e4..f827404650d 100644 --- a/lib/python/pyngcgui.py +++ b/lib/python/pyngcgui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Notes: # 1) ini file items: diff --git a/lib/python/qtvcp/lib/colored_formatter.py b/lib/python/qtvcp/lib/colored_formatter.py index 2f192a921b4..fecdea0286a 100755 --- a/lib/python/qtvcp/lib/colored_formatter.py +++ b/lib/python/qtvcp/lib/colored_formatter.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) 2017 Kurt Jacobson diff --git a/lib/python/qtvcp/lib/gcode_utility/facing.py b/lib/python/qtvcp/lib/gcode_utility/facing.py index d9bb24f2d77..595d5e3573c 100644 --- a/lib/python/qtvcp/lib/gcode_utility/facing.py +++ b/lib/python/qtvcp/lib/gcode_utility/facing.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys import os import numpy as np diff --git a/lib/python/qtvcp/lib/gcode_utility/hole_circle.py b/lib/python/qtvcp/lib/gcode_utility/hole_circle.py index b24f1630b60..04cdd83c74b 100644 --- a/lib/python/qtvcp/lib/gcode_utility/hole_circle.py +++ b/lib/python/qtvcp/lib/gcode_utility/hole_circle.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys import os import math diff --git a/lib/python/qtvcp/lib/gcodes.py b/lib/python/qtvcp/lib/gcodes.py index df667abb025..d6595b9ce8d 100755 --- a/lib/python/qtvcp/lib/gcodes.py +++ b/lib/python/qtvcp/lib/gcodes.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from . import mdi_text as mdiText from qtvcp.qt_makegui import VCPWindow diff --git a/lib/python/qtvcp/lib/qt_vismach/mill_xyz.py b/lib/python/qtvcp/lib/qt_vismach/mill_xyz.py index 7174d8e5e8d..e9ec03b89a4 100755 --- a/lib/python/qtvcp/lib/qt_vismach/mill_xyz.py +++ b/lib/python/qtvcp/lib/qt_vismach/mill_xyz.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python3 # Rolf Redford, Nov 2018 # modded for qtvcp Chris Morley 2020 diff --git a/lib/python/qtvcp/lib/qt_vismach/qt_vismach.py b/lib/python/qtvcp/lib/qt_vismach/qt_vismach.py index 05720b004fb..65900ddb100 100644 --- a/lib/python/qtvcp/lib/qt_vismach/qt_vismach.py +++ b/lib/python/qtvcp/lib/qt_vismach/qt_vismach.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys diff --git a/lib/python/qtvcp/lib/qt_vismach/scara.py b/lib/python/qtvcp/lib/qt_vismach/scara.py index 5d407ca5485..723f19dd9b5 100644 --- a/lib/python/qtvcp/lib/qt_vismach/scara.py +++ b/lib/python/qtvcp/lib/qt_vismach/scara.py @@ -1,4 +1,4 @@ - #! /usr/bin/python2 +#!/usr/bin/env python3 # Copyright 2007 John Kasunich and Jeff Epler # # This program is free software; you can redistribute it and/or modify diff --git a/lib/python/qtvcp/lib/sys_notify.py b/lib/python/qtvcp/lib/sys_notify.py index cc2c2724dc8..f88f753e0e4 100644 --- a/lib/python/qtvcp/lib/sys_notify.py +++ b/lib/python/qtvcp/lib/sys_notify.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # QTVcp Notification Module # Provides a consistent and easy to use facility for showing system notifications. diff --git a/lib/python/qtvcp/lib/toolbar_actions.py b/lib/python/qtvcp/lib/toolbar_actions.py index 7d110f7299f..bc5f81d4b5e 100644 --- a/lib/python/qtvcp/lib/toolbar_actions.py +++ b/lib/python/qtvcp/lib/toolbar_actions.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # QTvcp Tool Bar Action # # Copyright (c) 2019 Chris Morley diff --git a/lib/python/qtvcp/lib/writer/writer.py b/lib/python/qtvcp/lib/writer/writer.py index 16ddcdd715b..08a017ba667 100755 --- a/lib/python/qtvcp/lib/writer/writer.py +++ b/lib/python/qtvcp/lib/writer/writer.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python3 # https://www.binpress.com/building-text-editor-pyqt-1/ diff --git a/lib/python/qtvcp/lib/xembed.py b/lib/python/qtvcp/lib/xembed.py index f443d91badb..76a9f08b338 100644 --- a/lib/python/qtvcp/lib/xembed.py +++ b/lib/python/qtvcp/lib/xembed.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Qtvcp # # Copyright (c) 2018 Chris Morley diff --git a/lib/python/qtvcp/logger.py b/lib/python/qtvcp/logger.py index 32fd1bc99b1..9c421140194 100755 --- a/lib/python/qtvcp/logger.py +++ b/lib/python/qtvcp/logger.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # QTVcp Logging Module # Provides a consistent and easy to use logging facility. Log messages printed diff --git a/lib/python/qtvcp/plugins/actionbutton_plugin.py b/lib/python/qtvcp/plugins/actionbutton_plugin.py index 4384fcd264d..bce787f4a3a 100644 --- a/lib/python/qtvcp/plugins/actionbutton_plugin.py +++ b/lib/python/qtvcp/plugins/actionbutton_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sip from PyQt5 import QtCore, QtGui, QtWidgets diff --git a/lib/python/qtvcp/plugins/basic_probe_plugin.py b/lib/python/qtvcp/plugins/basic_probe_plugin.py index ff0859066f0..e5e8f738d51 100644 --- a/lib/python/qtvcp/plugins/basic_probe_plugin.py +++ b/lib/python/qtvcp/plugins/basic_probe_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/camview_plugin.py b/lib/python/qtvcp/plugins/camview_plugin.py index 2af44d417c3..b53d6a9b455 100644 --- a/lib/python/qtvcp/plugins/camview_plugin.py +++ b/lib/python/qtvcp/plugins/camview_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 from PyQt5.QtGui import QIcon, QPixmap from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/container_plugin.py b/lib/python/qtvcp/plugins/container_plugin.py index 86beda5a0cf..c12e45c9749 100644 --- a/lib/python/qtvcp/plugins/container_plugin.py +++ b/lib/python/qtvcp/plugins/container_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from PyQt5 import QtGui from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/detach_tabs_plugin.py b/lib/python/qtvcp/plugins/detach_tabs_plugin.py index fc75d3721f4..38348fa79ea 100644 --- a/lib/python/qtvcp/plugins/detach_tabs_plugin.py +++ b/lib/python/qtvcp/plugins/detach_tabs_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from PyQt5 import QtGui from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/dialog_plugin.py b/lib/python/qtvcp/plugins/dialog_plugin.py index f16f80ca15a..e4fa743086f 100644 --- a/lib/python/qtvcp/plugins/dialog_plugin.py +++ b/lib/python/qtvcp/plugins/dialog_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 from PyQt5.QtGui import QIcon, QPixmap from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/graphics_plugin.py b/lib/python/qtvcp/plugins/graphics_plugin.py index 64f04a063b8..b817af29d01 100644 --- a/lib/python/qtvcp/plugins/graphics_plugin.py +++ b/lib/python/qtvcp/plugins/graphics_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from PyQt5 import QtCore, QtGui from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/hal_label_plugin.py b/lib/python/qtvcp/plugins/hal_label_plugin.py index 2d168be86b6..53e93ab7bb8 100644 --- a/lib/python/qtvcp/plugins/hal_label_plugin.py +++ b/lib/python/qtvcp/plugins/hal_label_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 from PyQt5.QtGui import QIcon, QPixmap from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/jogincrements_plugin.py b/lib/python/qtvcp/plugins/jogincrements_plugin.py index 154aede492f..a45c74612ee 100644 --- a/lib/python/qtvcp/plugins/jogincrements_plugin.py +++ b/lib/python/qtvcp/plugins/jogincrements_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 from PyQt5.QtGui import QIcon, QPixmap from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/led_plugin.py b/lib/python/qtvcp/plugins/led_plugin.py index 99ff4f9da38..37ee8c664cc 100644 --- a/lib/python/qtvcp/plugins/led_plugin.py +++ b/lib/python/qtvcp/plugins/led_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 from PyQt5.QtGui import QIcon, QPixmap from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/overlay_plugin.py b/lib/python/qtvcp/plugins/overlay_plugin.py index 17a747d5d9e..e4683d0a900 100644 --- a/lib/python/qtvcp/plugins/overlay_plugin.py +++ b/lib/python/qtvcp/plugins/overlay_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 from PyQt5.QtGui import QIcon, QPixmap from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/qtvcp_plugin.py b/lib/python/qtvcp/plugins/qtvcp_plugin.py index 9333ab2c020..a6bf505d673 100644 --- a/lib/python/qtvcp/plugins/qtvcp_plugin.py +++ b/lib/python/qtvcp/plugins/qtvcp_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 # QT Designer custom widget plugin imports for linuxcnc # diff --git a/lib/python/qtvcp/plugins/round_gauge_plugin.py b/lib/python/qtvcp/plugins/round_gauge_plugin.py index d3bae501269..ca8ca2f8f61 100644 --- a/lib/python/qtvcp/plugins/round_gauge_plugin.py +++ b/lib/python/qtvcp/plugins/round_gauge_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from PyQt5.QtGui import QIcon, QPixmap from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/round_progress_bar_plugin.py b/lib/python/qtvcp/plugins/round_progress_bar_plugin.py index 6cc6bc79a21..5cedd9fc08f 100644 --- a/lib/python/qtvcp/plugins/round_progress_bar_plugin.py +++ b/lib/python/qtvcp/plugins/round_progress_bar_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 from PyQt5.QtGui import QIcon, QPixmap from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/screenoptions_plugin.py b/lib/python/qtvcp/plugins/screenoptions_plugin.py index 15cf1326cab..8b25cd407e3 100644 --- a/lib/python/qtvcp/plugins/screenoptions_plugin.py +++ b/lib/python/qtvcp/plugins/screenoptions_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin, \ diff --git a/lib/python/qtvcp/plugins/simplewidgets_plugin.py b/lib/python/qtvcp/plugins/simplewidgets_plugin.py index f3760778306..a2428b2d3be 100644 --- a/lib/python/qtvcp/plugins/simplewidgets_plugin.py +++ b/lib/python/qtvcp/plugins/simplewidgets_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from PyQt5 import QtCore, QtGui from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/state_label_plugin.py b/lib/python/qtvcp/plugins/state_label_plugin.py index 1f4179267bd..e4f55822198 100644 --- a/lib/python/qtvcp/plugins/state_label_plugin.py +++ b/lib/python/qtvcp/plugins/state_label_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 from PyQt5.QtGui import QIcon, QPixmap from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/state_led_plugin.py b/lib/python/qtvcp/plugins/state_led_plugin.py index ac43624c41d..25b4d05c502 100644 --- a/lib/python/qtvcp/plugins/state_led_plugin.py +++ b/lib/python/qtvcp/plugins/state_led_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 from PyQt5.QtGui import QIcon, QPixmap from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/status_adjustment_bar_plugin.py b/lib/python/qtvcp/plugins/status_adjustment_bar_plugin.py index 5aedec117cc..603d651dd4c 100644 --- a/lib/python/qtvcp/plugins/status_adjustment_bar_plugin.py +++ b/lib/python/qtvcp/plugins/status_adjustment_bar_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 from PyQt5.QtGui import QIcon, QPixmap from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/status_label_plugin.py b/lib/python/qtvcp/plugins/status_label_plugin.py index d80c7ff083e..f95c3190e5a 100644 --- a/lib/python/qtvcp/plugins/status_label_plugin.py +++ b/lib/python/qtvcp/plugins/status_label_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import sip from PyQt5 import QtCore, QtGui, QtWidgets diff --git a/lib/python/qtvcp/plugins/status_slider_plugin.py b/lib/python/qtvcp/plugins/status_slider_plugin.py index 24ad1ed69fc..8a96f79fcf0 100644 --- a/lib/python/qtvcp/plugins/status_slider_plugin.py +++ b/lib/python/qtvcp/plugins/status_slider_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 from PyQt5.QtGui import QIcon, QPixmap from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/tab_widget_plugin.py b/lib/python/qtvcp/plugins/tab_widget_plugin.py index 66f7dd64f09..a011be8744e 100644 --- a/lib/python/qtvcp/plugins/tab_widget_plugin.py +++ b/lib/python/qtvcp/plugins/tab_widget_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from PyQt5 import QtCore, QtGui from PyQt5.QtWidgets import QWidget diff --git a/lib/python/qtvcp/plugins/toolbutton_plugin.py b/lib/python/qtvcp/plugins/toolbutton_plugin.py index 82efd751647..95c532e276a 100644 --- a/lib/python/qtvcp/plugins/toolbutton_plugin.py +++ b/lib/python/qtvcp/plugins/toolbutton_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from PyQt5 import QtCore, QtGui from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/versa_probe_plugin.py b/lib/python/qtvcp/plugins/versa_probe_plugin.py index ff36b301123..80927737dd3 100644 --- a/lib/python/qtvcp/plugins/versa_probe_plugin.py +++ b/lib/python/qtvcp/plugins/versa_probe_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/virtualkeyboard_plugin.py b/lib/python/qtvcp/plugins/virtualkeyboard_plugin.py index b9e965dd1fb..67fdf347247 100644 --- a/lib/python/qtvcp/plugins/virtualkeyboard_plugin.py +++ b/lib/python/qtvcp/plugins/virtualkeyboard_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/plugins/widgets_plugin.py b/lib/python/qtvcp/plugins/widgets_plugin.py index 2f37c79da75..a93a2b9982e 100644 --- a/lib/python/qtvcp/plugins/widgets_plugin.py +++ b/lib/python/qtvcp/plugins/widgets_plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from PyQt5 import QtCore, QtGui from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin diff --git a/lib/python/qtvcp/qt_makepins.py b/lib/python/qtvcp/qt_makepins.py index 0adcd9e2398..5c5de7c4abd 100644 --- a/lib/python/qtvcp/qt_makepins.py +++ b/lib/python/qtvcp/qt_makepins.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 # -*- encoding: utf-8 -*- # QT_VCP # Copyright 2016 Chris Morley diff --git a/lib/python/qtvcp/qt_pstat.py b/lib/python/qtvcp/qt_pstat.py index 3d6df877d14..9fb0a3e7e68 100644 --- a/lib/python/qtvcp/qt_pstat.py +++ b/lib/python/qtvcp/qt_pstat.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Qtvcp # # Copyright (c) 2017 Chris Morley diff --git a/lib/python/qtvcp/qt_tstat.py b/lib/python/qtvcp/qt_tstat.py index 7a4d859383f..8273770afb5 100644 --- a/lib/python/qtvcp/qt_tstat.py +++ b/lib/python/qtvcp/qt_tstat.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Qtvcp # # Copyright (c) 2017 Chris Morley diff --git a/lib/python/qtvcp/widgets/calculator.py b/lib/python/qtvcp/widgets/calculator.py index ee48ed86458..cd9429eb26f 100644 --- a/lib/python/qtvcp/widgets/calculator.py +++ b/lib/python/qtvcp/widgets/calculator.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import math import sys diff --git a/lib/python/qtvcp/widgets/fake_status.py b/lib/python/qtvcp/widgets/fake_status.py index 30fdca7b9ad..7ffae78f067 100644 --- a/lib/python/qtvcp/widgets/fake_status.py +++ b/lib/python/qtvcp/widgets/fake_status.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # -*- encoding: utf-8 -*- # # Copyright 2020 Chris Morley diff --git a/lib/python/qtvcp/widgets/file_manager.py b/lib/python/qtvcp/widgets/file_manager.py index 346d369260d..76233671727 100644 --- a/lib/python/qtvcp/widgets/file_manager.py +++ b/lib/python/qtvcp/widgets/file_manager.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import sys import os diff --git a/lib/python/qtvcp/widgets/gcode_editor.py b/lib/python/qtvcp/widgets/gcode_editor.py index 70d5d4c0993..69c2b369a25 100644 --- a/lib/python/qtvcp/widgets/gcode_editor.py +++ b/lib/python/qtvcp/widgets/gcode_editor.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # -*- encoding: utf-8 -*- # Gcode display / edit widget for QT_VCP # Copyright 2016 Chris Morley diff --git a/lib/python/qtvcp/widgets/gcode_graphics.py b/lib/python/qtvcp/widgets/gcode_graphics.py index eefdedffb8c..016a1a5c28b 100644 --- a/lib/python/qtvcp/widgets/gcode_graphics.py +++ b/lib/python/qtvcp/widgets/gcode_graphics.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # -*- encoding: utf-8 -*- # # Copyright 2016 Chris Morley diff --git a/lib/python/qtvcp/widgets/general_hal_input.py b/lib/python/qtvcp/widgets/general_hal_input.py index c13cc8427d8..65b22ca7f11 100644 --- a/lib/python/qtvcp/widgets/general_hal_input.py +++ b/lib/python/qtvcp/widgets/general_hal_input.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # # Qtvcp widget # Copyright (c) 2017 Chris Morley diff --git a/lib/python/qtvcp/widgets/general_hal_output.py b/lib/python/qtvcp/widgets/general_hal_output.py index cd769d457b9..a2b42613597 100644 --- a/lib/python/qtvcp/widgets/general_hal_output.py +++ b/lib/python/qtvcp/widgets/general_hal_output.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # # Qtvcp widget # Copyright (c) 2017 Chris Morley diff --git a/lib/python/qtvcp/widgets/hal_label.py b/lib/python/qtvcp/widgets/hal_label.py index eec65f8715a..fac75d1ba73 100644 --- a/lib/python/qtvcp/widgets/hal_label.py +++ b/lib/python/qtvcp/widgets/hal_label.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.7 +#!/usr/bin/env python3 # # Qtvcp widget # Copyright (c) 2017 Chris Morley diff --git a/lib/python/qtvcp/widgets/image_switcher.py b/lib/python/qtvcp/widgets/image_switcher.py index 724b0dc2f41..0e348f4c4a8 100644 --- a/lib/python/qtvcp/widgets/image_switcher.py +++ b/lib/python/qtvcp/widgets/image_switcher.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # qtvcp # # Copyright (c) 2018 Chris Morley diff --git a/lib/python/qtvcp/widgets/jog_increments.py b/lib/python/qtvcp/widgets/jog_increments.py index f07adbeb441..1007728a448 100644 --- a/lib/python/qtvcp/widgets/jog_increments.py +++ b/lib/python/qtvcp/widgets/jog_increments.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # qtvcp # # Copyright (c) 2017 Chris Morley diff --git a/lib/python/qtvcp/widgets/led_widget.py b/lib/python/qtvcp/widgets/led_widget.py index 360b0c67e43..a86027ba913 100644 --- a/lib/python/qtvcp/widgets/led_widget.py +++ b/lib/python/qtvcp/widgets/led_widget.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # qtvcp # # Copyright (c) 2017 Chris Morley diff --git a/lib/python/qtvcp/widgets/macro_widget.py b/lib/python/qtvcp/widgets/macro_widget.py index b79fb030c74..485d1d2178f 100644 --- a/lib/python/qtvcp/widgets/macro_widget.py +++ b/lib/python/qtvcp/widgets/macro_widget.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # # Qtvcp Widgets # Copyright (c) 2017 Chris Morley diff --git a/lib/python/qtvcp/widgets/nurbs_editor.py b/lib/python/qtvcp/widgets/nurbs_editor.py index 31c6eadb33b..8495655307e 100644 --- a/lib/python/qtvcp/widgets/nurbs_editor.py +++ b/lib/python/qtvcp/widgets/nurbs_editor.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 ############################################################################# ## ## Copyright (C) 2010 Hans-Peter Jansen . diff --git a/lib/python/qtvcp/widgets/overlay_widget.py b/lib/python/qtvcp/widgets/overlay_widget.py index 2a123d12661..e0b6d09814a 100644 --- a/lib/python/qtvcp/widgets/overlay_widget.py +++ b/lib/python/qtvcp/widgets/overlay_widget.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # # Qtvcp widget # Copyright (c) 2017 Chris Morley diff --git a/lib/python/qtvcp/widgets/qtvcp_icons.py b/lib/python/qtvcp/widgets/qtvcp_icons.py index 37f57fd7564..4866503549b 100644 --- a/lib/python/qtvcp/widgets/qtvcp_icons.py +++ b/lib/python/qtvcp/widgets/qtvcp_icons.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import os # Set up logging diff --git a/lib/python/qtvcp/widgets/radio_axis_selector.py b/lib/python/qtvcp/widgets/radio_axis_selector.py index 227fcc2d423..3fd3525a140 100644 --- a/lib/python/qtvcp/widgets/radio_axis_selector.py +++ b/lib/python/qtvcp/widgets/radio_axis_selector.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 from PyQt5 import QtCore, QtWidgets from qtvcp.widgets.widget_baseclass import _HalWidgetBase diff --git a/lib/python/qtvcp/widgets/richtext_selector.py b/lib/python/qtvcp/widgets/richtext_selector.py index 9b98e99f68e..5d3dde201e2 100644 --- a/lib/python/qtvcp/widgets/richtext_selector.py +++ b/lib/python/qtvcp/widgets/richtext_selector.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 from PyQt5.QtGui import * from PyQt5.QtWidgets import * from PyQt5.QtCore import * diff --git a/lib/python/qtvcp/widgets/round_gauge.py b/lib/python/qtvcp/widgets/round_gauge.py index 1431053b260..67c2582cb16 100644 --- a/lib/python/qtvcp/widgets/round_gauge.py +++ b/lib/python/qtvcp/widgets/round_gauge.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 import sys import math from PyQt5 import QtCore, QtGui, QtWidgets diff --git a/lib/python/qtvcp/widgets/screen_options.py b/lib/python/qtvcp/widgets/screen_options.py index e2959bd1c9b..eac01164907 100644 --- a/lib/python/qtvcp/widgets/screen_options.py +++ b/lib/python/qtvcp/widgets/screen_options.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # # Qtvcp widget # Copyright (c) 2017 Chris Morley diff --git a/lib/python/qtvcp/widgets/state_label.py b/lib/python/qtvcp/widgets/state_label.py index ea242f646b2..d95a4cd4f14 100644 --- a/lib/python/qtvcp/widgets/state_label.py +++ b/lib/python/qtvcp/widgets/state_label.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # QTVcp Widget # # Copyright (c) 2017 Chris Morley diff --git a/lib/python/qtvcp/widgets/state_led.py b/lib/python/qtvcp/widgets/state_led.py index 448cfe7fcbc..a7851c06d10 100644 --- a/lib/python/qtvcp/widgets/state_led.py +++ b/lib/python/qtvcp/widgets/state_led.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Qtvcp widget # # Copyright (c) 2017 Chris Morley diff --git a/lib/python/qtvcp/widgets/status_label.py b/lib/python/qtvcp/widgets/status_label.py index ca85936c5b5..8dd0c0bf96f 100644 --- a/lib/python/qtvcp/widgets/status_label.py +++ b/lib/python/qtvcp/widgets/status_label.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # QTVcp Widget # # Copyright (c) 2017 Chris Morley diff --git a/lib/python/qtvcp/widgets/status_stacked.py b/lib/python/qtvcp/widgets/status_stacked.py index 09f1f42f80f..09236027f29 100644 --- a/lib/python/qtvcp/widgets/status_stacked.py +++ b/lib/python/qtvcp/widgets/status_stacked.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # qtvcp # # Copyright (c) 2017 Chris Morley diff --git a/lib/python/qtvcp/widgets/stylesheeteditor.py b/lib/python/qtvcp/widgets/stylesheeteditor.py index a7d6c895820..96a2bfdea46 100644 --- a/lib/python/qtvcp/widgets/stylesheeteditor.py +++ b/lib/python/qtvcp/widgets/stylesheeteditor.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 ############################################################################ ## ## Copyright (C) 2010 Hans-Peter Jansen . diff --git a/lib/python/qtvcp/widgets/widget_switcher.py b/lib/python/qtvcp/widgets/widget_switcher.py index 9b57654635a..2bc8a4e30c1 100644 --- a/lib/python/qtvcp/widgets/widget_switcher.py +++ b/lib/python/qtvcp/widgets/widget_switcher.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # qtvcp # # Copyright (c) 2018 Chris Morley diff --git a/lib/python/qtvcp/widgets/xembed.py b/lib/python/qtvcp/widgets/xembed.py index 8c2d57c9d11..d8121a186cc 100644 --- a/lib/python/qtvcp/widgets/xembed.py +++ b/lib/python/qtvcp/widgets/xembed.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import sys, time import os import subprocess diff --git a/lib/python/rs274/OpenGLTk.py b/lib/python/rs274/OpenGLTk.py index 6be7a263f36..0b0e1af7e5a 100755 --- a/lib/python/rs274/OpenGLTk.py +++ b/lib/python/rs274/OpenGLTk.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This file is from PyOpenGL-2.0.1.07. That distribution's license is # """License :: OSI Approved :: BSD License""", diff --git a/lib/python/rs274/options.py b/lib/python/rs274/options.py index 2d81907fa25..94f625ee148 100644 --- a/lib/python/rs274/options.py +++ b/lib/python/rs274/options.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This is a component of AXIS, a front-end for emc # Copyright 2004, 2005, 2006 Jeff Epler # diff --git a/scripts/decode_dmesg b/scripts/decode_dmesg index f92b48b26e7..04a2c76eca5 100755 --- a/scripts/decode_dmesg +++ b/scripts/decode_dmesg @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """\ This script decodes hex floats (e.g., in dmesg) into real floats. In the future maybe it will do other emc2-specific dmesg decoding. diff --git a/scripts/torture.py b/scripts/torture.py index 6bc5986e9b6..f05e09a3922 100755 --- a/scripts/torture.py +++ b/scripts/torture.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2012 Jeff Epler # # This program is free software; you can redistribute it and/or modify diff --git a/src/emc/usr_intf/axis/scripts/debuglevel.py b/src/emc/usr_intf/axis/scripts/debuglevel.py index d691f56e439..8b6ae928c20 100644 --- a/src/emc/usr_intf/axis/scripts/debuglevel.py +++ b/src/emc/usr_intf/axis/scripts/debuglevel.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys, os import gettext BASE = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..")) diff --git a/src/emc/usr_intf/axis/scripts/hal_manualtoolchange.py b/src/emc/usr_intf/axis/scripts/hal_manualtoolchange.py index 730f8d8e242..1df5cc0a099 100644 --- a/src/emc/usr_intf/axis/scripts/hal_manualtoolchange.py +++ b/src/emc/usr_intf/axis/scripts/hal_manualtoolchange.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys, os import gettext BASE = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..")) diff --git a/src/emc/usr_intf/axis/scripts/image-to-gcode.py b/src/emc/usr_intf/axis/scripts/image-to-gcode.py index eb62cf69f49..259c94bf78f 100644 --- a/src/emc/usr_intf/axis/scripts/image-to-gcode.py +++ b/src/emc/usr_intf/axis/scripts/image-to-gcode.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 ## image-to-gcode is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by the diff --git a/src/emc/usr_intf/axis/scripts/lintini.py b/src/emc/usr_intf/axis/scripts/lintini.py index 31b606d7261..e857dae1568 100755 --- a/src/emc/usr_intf/axis/scripts/lintini.py +++ b/src/emc/usr_intf/axis/scripts/lintini.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This is a component of AXIS, a front-end for LinuxCNC # Copyright 2004, 2005, 2006 Jeff Epler and # Chris Radek diff --git a/src/emc/usr_intf/axis/scripts/mdi.py b/src/emc/usr_intf/axis/scripts/mdi.py index ec49cb98eae..8a9b418b002 100644 --- a/src/emc/usr_intf/axis/scripts/mdi.py +++ b/src/emc/usr_intf/axis/scripts/mdi.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This is a component of AXIS, a front-end for LinuxCNC # Copyright 2004, 2005, 2006 Jeff Epler # diff --git a/src/emc/usr_intf/axis/scripts/teach-in.py b/src/emc/usr_intf/axis/scripts/teach-in.py index 9979aade89c..d8d3904af3e 100755 --- a/src/emc/usr_intf/axis/scripts/teach-in.py +++ b/src/emc/usr_intf/axis/scripts/teach-in.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Usage: python teach.py nmlfile outputfile If outputfile is not specified, writes to standard output. diff --git a/src/emc/usr_intf/axis/scripts/tracking-test.py b/src/emc/usr_intf/axis/scripts/tracking-test.py index 427249abae5..0fbc7695a80 100755 --- a/src/emc/usr_intf/axis/scripts/tracking-test.py +++ b/src/emc/usr_intf/axis/scripts/tracking-test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2007 Ben Lipkowitz # You may distribute this software under the GNU GPL v2 or later # diff --git a/src/emc/usr_intf/gmoccapy/dialogs.py b/src/emc/usr_intf/gmoccapy/dialogs.py index fa6a4f16f97..4b6d4670a3d 100644 --- a/src/emc/usr_intf/gmoccapy/dialogs.py +++ b/src/emc/usr_intf/gmoccapy/dialogs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 ''' This class is used to handle the dialogs from gmoccapy, diff --git a/src/emc/usr_intf/gmoccapy/getiniinfo.py b/src/emc/usr_intf/gmoccapy/getiniinfo.py index f19c88b26df..6c6dd132bd4 100644 --- a/src/emc/usr_intf/gmoccapy/getiniinfo.py +++ b/src/emc/usr_intf/gmoccapy/getiniinfo.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 ''' This class is used to get information from a config.ini file, diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py index 4ebfce49de6..8c0d7170649 100644 --- a/src/emc/usr_intf/gmoccapy/gmoccapy.py +++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding:UTF-8 -*- """ A GUI for LinuxCNC based on gladevcp and Python diff --git a/src/emc/usr_intf/gmoccapy/notification.py b/src/emc/usr_intf/gmoccapy/notification.py index a53cd5e016e..f5680399a84 100755 --- a/src/emc/usr_intf/gmoccapy/notification.py +++ b/src/emc/usr_intf/gmoccapy/notification.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 ''' This widget can be used to show small popup windows showing messages. diff --git a/src/emc/usr_intf/gmoccapy/player.py b/src/emc/usr_intf/gmoccapy/player.py index b91f9c77182..1f27a285600 100644 --- a/src/emc/usr_intf/gmoccapy/player.py +++ b/src/emc/usr_intf/gmoccapy/player.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 ''' This class is used to handle sound messages from gmoccapy, diff --git a/src/emc/usr_intf/gmoccapy/widgets.py b/src/emc/usr_intf/gmoccapy/widgets.py index 6d8e9b68a22..427ae08945b 100644 --- a/src/emc/usr_intf/gmoccapy/widgets.py +++ b/src/emc/usr_intf/gmoccapy/widgets.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 ''' This class is just to handle the widgets of gmoccapy, diff --git a/src/emc/usr_intf/gremlin/gremlin-run b/src/emc/usr_intf/gremlin/gremlin-run index b20dfe3a8e9..5b4771a0f3c 100755 --- a/src/emc/usr_intf/gremlin/gremlin-run +++ b/src/emc/usr_intf/gremlin/gremlin-run @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys import os diff --git a/src/emc/usr_intf/gremlin/gremlin.py b/src/emc/usr_intf/gremlin/gremlin.py index 6cfd1dd8114..215ca565bc5 100755 --- a/src/emc/usr_intf/gremlin/gremlin.py +++ b/src/emc/usr_intf/gremlin/gremlin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2009-2012 # Jeff Epler , # Pavel Shramov , diff --git a/src/emc/usr_intf/gscreen/gscreen.py b/src/emc/usr_intf/gscreen/gscreen.py index b12667bb883..163cee580d6 100755 --- a/src/emc/usr_intf/gscreen/gscreen.py +++ b/src/emc/usr_intf/gscreen/gscreen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Gscreen a GUI for linuxcnc cnc controller # Chris Morley copyright 2012 diff --git a/src/emc/usr_intf/pncconf/build_HAL.py b/src/emc/usr_intf/pncconf/build_HAL.py index a26c7e94164..7816ecfff93 100644 --- a/src/emc/usr_intf/pncconf/build_HAL.py +++ b/src/emc/usr_intf/pncconf/build_HAL.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # This is PNCconf, a graphical configuration editor for LinuxCNC # Copyright 2007 Jeff Epler diff --git a/src/emc/usr_intf/pncconf/data.py b/src/emc/usr_intf/pncconf/data.py index bed54fb64bd..ddfa037b29f 100644 --- a/src/emc/usr_intf/pncconf/data.py +++ b/src/emc/usr_intf/pncconf/data.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- encoding: utf-8 -*- # This is pncconf, a graphical configuration editor for LinuxCNC # Chris Morley copyright 2009 diff --git a/src/emc/usr_intf/pncconf/pages.py b/src/emc/usr_intf/pncconf/pages.py index 17a2761bdae..c8659d1b976 100644 --- a/src/emc/usr_intf/pncconf/pages.py +++ b/src/emc/usr_intf/pncconf/pages.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- encoding: utf-8 -*- # # This is pncconf, a graphical configuration editor for LinuxCNC diff --git a/src/emc/usr_intf/pncconf/pncconf.py b/src/emc/usr_intf/pncconf/pncconf.py index 2d4acca2880..5af9826ae1b 100755 --- a/src/emc/usr_intf/pncconf/pncconf.py +++ b/src/emc/usr_intf/pncconf/pncconf.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- encoding: utf-8 -*- # This is pncconf, a graphical configuration editor for LinuxCNC # Chris Morley copyright 2009 diff --git a/src/emc/usr_intf/pncconf/private_data.py b/src/emc/usr_intf/pncconf/private_data.py index 0de3fe5f62c..9f00d087cc1 100644 --- a/src/emc/usr_intf/pncconf/private_data.py +++ b/src/emc/usr_intf/pncconf/private_data.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- encoding: utf-8 -*- # # This is pncconf, a graphical configuration editor for LinuxCNC diff --git a/src/emc/usr_intf/pncconf/tests.py b/src/emc/usr_intf/pncconf/tests.py index 9456423c6c2..575c769fd5a 100644 --- a/src/emc/usr_intf/pncconf/tests.py +++ b/src/emc/usr_intf/pncconf/tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.4 +#!/usr/bin/env python3 # -*- encoding: utf-8 -*- # This is pncconf, a graphical configuration editor for LinuxCNC # Chris Morley copyright 2009 diff --git a/src/emc/usr_intf/pyui/pyui.py b/src/emc/usr_intf/pyui/pyui.py index e6d6194e878..91e00487b48 100755 --- a/src/emc/usr_intf/pyui/pyui.py +++ b/src/emc/usr_intf/pyui/pyui.py @@ -1,3 +1,3 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from pyui import master validate = master.keyboard.validate(master.keyboard()) diff --git a/src/emc/usr_intf/qtvcp/qtvcp.py b/src/emc/usr_intf/qtvcp/qtvcp.py index cf0c1093659..93214b33c7d 100644 --- a/src/emc/usr_intf/qtvcp/qtvcp.py +++ b/src/emc/usr_intf/qtvcp/qtvcp.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import os import sys diff --git a/src/emc/usr_intf/stepconf/build_HAL.py b/src/emc/usr_intf/stepconf/build_HAL.py index e06be1d6a03..a319d2ba384 100755 --- a/src/emc/usr_intf/stepconf/build_HAL.py +++ b/src/emc/usr_intf/stepconf/build_HAL.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # This is stepconf, a graphical configuration editor for LinuxCNC # Copyright 2007 Jeff Epler diff --git a/src/emc/usr_intf/stepconf/build_INI.py b/src/emc/usr_intf/stepconf/build_INI.py index 946bdfc952a..9045cd2ac4b 100644 --- a/src/emc/usr_intf/stepconf/build_INI.py +++ b/src/emc/usr_intf/stepconf/build_INI.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- encoding: utf-8 -*- # # This is stepconf, a graphical configuration editor for LinuxCNC diff --git a/src/emc/usr_intf/stepconf/import_mach.py b/src/emc/usr_intf/stepconf/import_mach.py index 552077b50b4..d925ddc625f 100644 --- a/src/emc/usr_intf/stepconf/import_mach.py +++ b/src/emc/usr_intf/stepconf/import_mach.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- encoding: utf-8 -*- # # This is import_mach, a program to convert a mach 3 xml file to stepconf diff --git a/src/emc/usr_intf/stepconf/pages.py b/src/emc/usr_intf/stepconf/pages.py index 85a075f6cba..a2e2df22ca6 100755 --- a/src/emc/usr_intf/stepconf/pages.py +++ b/src/emc/usr_intf/stepconf/pages.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- encoding: utf-8 -*- # # This is stepconf, a graphical configuration editor for LinuxCNC diff --git a/src/emc/usr_intf/stepconf/stepconf.py b/src/emc/usr_intf/stepconf/stepconf.py index 8f6d262871f..bd0dfaa4baa 100755 --- a/src/emc/usr_intf/stepconf/stepconf.py +++ b/src/emc/usr_intf/stepconf/stepconf.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 # -*- encoding: utf-8 -*- # # This is stepconf, a graphical configuration editor for LinuxCNC diff --git a/src/emc/usr_intf/touchy/touchy.py b/src/emc/usr_intf/touchy/touchy.py index 98b53474338..02ccddc389b 100755 --- a/src/emc/usr_intf/touchy/touchy.py +++ b/src/emc/usr_intf/touchy/touchy.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Touchy is Copyright (c) 2009 Chris Radek # diff --git a/src/hal/user_comps/gladevcp.py b/src/hal/user_comps/gladevcp.py index 7218ca8190c..e054f032d23 100644 --- a/src/hal/user_comps/gladevcp.py +++ b/src/hal/user_comps/gladevcp.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: sts=4 sw=4 et # This is a component of EMC # gladevcp Copyright 2010 Chris Morley diff --git a/src/hal/user_comps/hal_input.py b/src/hal/user_comps/hal_input.py index 640e122129a..87c90e716db 100644 --- a/src/hal/user_comps/hal_input.py +++ b/src/hal/user_comps/hal_input.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2007 Jeff Epler # # This program is free software; you can redistribute it and/or modify diff --git a/src/hal/user_comps/mitsub_vfd.py b/src/hal/user_comps/mitsub_vfd.py index 449b310249a..e6c9b3ae218 100755 --- a/src/hal/user_comps/mitsub_vfd.py +++ b/src/hal/user_comps/mitsub_vfd.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This is a component of linuxcnc # mitsub_vfd Copyright 2017 Chris Morley # diff --git a/src/hal/user_comps/pyvcp.py b/src/hal/user_comps/pyvcp.py index 9b0a99617fa..f8b9bb22165 100755 --- a/src/hal/user_comps/pyvcp.py +++ b/src/hal/user_comps/pyvcp.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This is a component of emc # Copyright 2007 Anders Wallin # diff --git a/src/hal/user_comps/scorbot-er-3.py b/src/hal/user_comps/scorbot-er-3.py index 041a7322bf5..77c420d916d 100755 --- a/src/hal/user_comps/scorbot-er-3.py +++ b/src/hal/user_comps/scorbot-er-3.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2013-2016 Sebastian Kuzminsky # diff --git a/src/hal/user_comps/vismach/5axisgui.py b/src/hal/user_comps/vismach/5axisgui.py index 9470024c25e..40fc0475126 100755 --- a/src/hal/user_comps/vismach/5axisgui.py +++ b/src/hal/user_comps/vismach/5axisgui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2007 Chris Radek # Derived from a work by John Kasunich and Jeff Epler # diff --git a/src/hal/user_comps/vismach/hbmgui.py b/src/hal/user_comps/vismach/hbmgui.py index 0266c4c91b7..f1c5223015b 100755 --- a/src/hal/user_comps/vismach/hbmgui.py +++ b/src/hal/user_comps/vismach/hbmgui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Visulization model of a Horizontal Boring Mill with quill # diff --git a/src/hal/user_comps/vismach/hexagui.py b/src/hal/user_comps/vismach/hexagui.py index 70cdf5dc2b9..65c9ed3949e 100755 --- a/src/hal/user_comps/vismach/hexagui.py +++ b/src/hal/user_comps/vismach/hexagui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2007 Ben Lipkowitz # You may distribute this software under the GNU GPL v2 or later # diff --git a/src/hal/user_comps/vismach/lineardelta.py b/src/hal/user_comps/vismach/lineardelta.py index b28141c9490..d8116b1a895 100644 --- a/src/hal/user_comps/vismach/lineardelta.py +++ b/src/hal/user_comps/vismach/lineardelta.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2013 Jeff Epler # # This program is free software; you can redistribute it and/or modify diff --git a/src/hal/user_comps/vismach/maho600gui.py b/src/hal/user_comps/vismach/maho600gui.py index 4d3269e7103..b8f37f2bc43 100755 --- a/src/hal/user_comps/vismach/maho600gui.py +++ b/src/hal/user_comps/vismach/maho600gui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Visulization model of U of Akron's Maho 600C with 2-axis NC table # diff --git a/src/hal/user_comps/vismach/max5gui.py b/src/hal/user_comps/vismach/max5gui.py index 64bce569afa..da539ba25ef 100755 --- a/src/hal/user_comps/vismach/max5gui.py +++ b/src/hal/user_comps/vismach/max5gui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Visulization model of Chris's MAX-NC mill, as modified to 5-axis # diff --git a/src/hal/user_comps/vismach/melfagui.py b/src/hal/user_comps/vismach/melfagui.py index 83916fb07bc..efd865431fd 100755 --- a/src/hal/user_comps/vismach/melfagui.py +++ b/src/hal/user_comps/vismach/melfagui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #-------------------------------------------------------------------------- # Visualization model of the Mitsubishi RV6-SDL 6axis serial manipulator diff --git a/src/hal/user_comps/vismach/millturngui.py b/src/hal/user_comps/vismach/millturngui.py index 422fc01c0ee..865b99f18eb 100755 --- a/src/hal/user_comps/vismach/millturngui.py +++ b/src/hal/user_comps/vismach/millturngui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # based on earlier work by Rolf Redford, Nov 2018 diff --git a/src/hal/user_comps/vismach/puma560gui.py b/src/hal/user_comps/vismach/puma560gui.py index ad26063de84..d07848e914d 100755 --- a/src/hal/user_comps/vismach/puma560gui.py +++ b/src/hal/user_comps/vismach/puma560gui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2009 Alex Joni # # This program is free software; you can redistribute it and/or modify diff --git a/src/hal/user_comps/vismach/pumagui.py b/src/hal/user_comps/vismach/pumagui.py index 1a5380508a4..7ae1d682b91 100755 --- a/src/hal/user_comps/vismach/pumagui.py +++ b/src/hal/user_comps/vismach/pumagui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2007 John Kasunich and Jeff Epler # # modified by Rudy du Preez to fit with the kinematics component pumakins.c diff --git a/src/hal/user_comps/vismach/rotarydelta.py b/src/hal/user_comps/vismach/rotarydelta.py index 82cd9220880..36d5088f584 100755 --- a/src/hal/user_comps/vismach/rotarydelta.py +++ b/src/hal/user_comps/vismach/rotarydelta.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2013 Jeff Epler # # This program is free software; you can redistribute it and/or modify diff --git a/src/hal/user_comps/vismach/scaragui.py b/src/hal/user_comps/vismach/scaragui.py index ae3d0f658ba..d9998c4b56a 100755 --- a/src/hal/user_comps/vismach/scaragui.py +++ b/src/hal/user_comps/vismach/scaragui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2007 John Kasunich and Jeff Epler # # This program is free software; you can redistribute it and/or modify diff --git a/src/hal/user_comps/vismach/xyzac-trt-gui.py b/src/hal/user_comps/vismach/xyzac-trt-gui.py index 23ed33a8f18..98f267355d1 100755 --- a/src/hal/user_comps/vismach/xyzac-trt-gui.py +++ b/src/hal/user_comps/vismach/xyzac-trt-gui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #************************************************************************** # Copyright 2016 Rudy du Preez # diff --git a/src/hal/user_comps/vismach/xyzbc-trt-gui.py b/src/hal/user_comps/vismach/xyzbc-trt-gui.py index c57f1169484..5a652511b38 100755 --- a/src/hal/user_comps/vismach/xyzbc-trt-gui.py +++ b/src/hal/user_comps/vismach/xyzbc-trt-gui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #************************************************************************** # Copyright 2016 Rudy du Preez # diff --git a/src/hal/utils/elbpcom.py b/src/hal/utils/elbpcom.py index 02f393f1f8c..a55d60489f5 100644 --- a/src/hal/utils/elbpcom.py +++ b/src/hal/utils/elbpcom.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # Copyright 2012-2015 # Peter C. Wallace and Jeff Epler diff --git a/src/hal/utils/halcompile.g b/src/hal/utils/halcompile.g index 6248424da5f..b2a48f50fff 100644 --- a/src/hal/utils/halcompile.g +++ b/src/hal/utils/halcompile.g @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This is 'halcompile', a tool to write HAL boilerplate # Copyright 2006 Jeff Epler # diff --git a/src/modsilent.py b/src/modsilent.py index b8e2fe796db..6dda686375a 100644 --- a/src/modsilent.py +++ b/src/modsilent.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import re import sys diff --git a/src/po/fixpaths.py b/src/po/fixpaths.py index 1278bd07927..88f24f1915f 100755 --- a/src/po/fixpaths.py +++ b/src/po/fixpaths.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import getopt import os import string diff --git a/tests/abort/feed-rate/test-ui.py b/tests/abort/feed-rate/test-ui.py index 18c9ac7bd4d..74b8e2ebc38 100755 --- a/tests/abort/feed-rate/test-ui.py +++ b/tests/abort/feed-rate/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import hal diff --git a/tests/abort/g64/test-ui.py b/tests/abort/g64/test-ui.py index decf205b133..7aa4b6dc231 100755 --- a/tests/abort/g64/test-ui.py +++ b/tests/abort/g64/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import time, sys, os diff --git a/tests/abort/on_abort_command-crazy-move/test-ui.py b/tests/abort/on_abort_command-crazy-move/test-ui.py index 9f360c8837d..85a5e32255d 100755 --- a/tests/abort/on_abort_command-crazy-move/test-ui.py +++ b/tests/abort/on_abort_command-crazy-move/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import linuxcnc_util diff --git a/tests/abort/stop-button-crazy-move/test-ui.py b/tests/abort/stop-button-crazy-move/test-ui.py index 28ca7867f19..897c56e4926 100755 --- a/tests/abort/stop-button-crazy-move/test-ui.py +++ b/tests/abort/stop-button-crazy-move/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import linuxcnc_util diff --git a/tests/ccomp/early-exit/test-ui.py b/tests/ccomp/early-exit/test-ui.py index 85bf5ac6eff..4df2b59bcfe 100755 --- a/tests/ccomp/early-exit/test-ui.py +++ b/tests/ccomp/early-exit/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import hal diff --git a/tests/hal-link-unlink/hallink.py b/tests/hal-link-unlink/hallink.py index 4009759252a..3ce6e9eee37 100755 --- a/tests/hal-link-unlink/hallink.py +++ b/tests/hal-link-unlink/hallink.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import subprocess import hal diff --git a/tests/halmodule.0/test.py b/tests/halmodule.0/test.py index 5cf6aa8075b..b06d9693197 100755 --- a/tests/halmodule.0/test.py +++ b/tests/halmodule.0/test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import hal import os diff --git a/tests/halmodule.1/stream_reader.py b/tests/halmodule.1/stream_reader.py index b5777d20d05..0aaa20965e8 100755 --- a/tests/halmodule.1/stream_reader.py +++ b/tests/halmodule.1/stream_reader.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import hal import time c = hal.component("stream_reader") diff --git a/tests/halmodule.1/stream_test.py b/tests/halmodule.1/stream_test.py index faa71f8e6e5..f7a90263bac 100755 --- a/tests/halmodule.1/stream_test.py +++ b/tests/halmodule.1/stream_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import os os.system("halcmd unload all") import hal diff --git a/tests/halmodule.1/stream_writer.py b/tests/halmodule.1/stream_writer.py index be4f00e47ec..a4161a0ad55 100755 --- a/tests/halmodule.1/stream_writer.py +++ b/tests/halmodule.1/stream_writer.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import hal import time c = hal.component("stream_writer") diff --git a/tests/halui/jogging/test-ui.py b/tests/halui/jogging/test-ui.py index 04668f4249f..858f38df542 100755 --- a/tests/halui/jogging/test-ui.py +++ b/tests/halui/jogging/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import hal diff --git a/tests/halui/mdi/test-ui.py b/tests/halui/mdi/test-ui.py index 55cad6df3e0..81afb4fd342 100755 --- a/tests/halui/mdi/test-ui.py +++ b/tests/halui/mdi/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import hal diff --git a/tests/hard-limits/test-ui.py b/tests/hard-limits/test-ui.py index 4badec840c0..61b1ffab036 100755 --- a/tests/hard-limits/test-ui.py +++ b/tests/hard-limits/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import hal diff --git a/tests/hm2-idrom/check-dmesg.py b/tests/hm2-idrom/check-dmesg.py index 0cf1a316717..5a8223533a6 100755 --- a/tests/hm2-idrom/check-dmesg.py +++ b/tests/hm2-idrom/check-dmesg.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 # # Here's the kind of output we're looking for: diff --git a/tests/interp/bad/test b/tests/interp/bad/test index da61831d29e..50f4102259d 100755 --- a/tests/interp/bad/test +++ b/tests/interp/bad/test @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import glob, os, sys fail = 0 diff --git a/tests/interp/good/test b/tests/interp/good/test index 0b387e78a9a..03ed53e7e4c 100755 --- a/tests/interp/good/test +++ b/tests/interp/good/test @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import glob, os, sys, filecmp fail = 0 diff --git a/tests/interp/m98m99/12-M99-endless-main-program/test-ui.py b/tests/interp/m98m99/12-M99-endless-main-program/test-ui.py index a0af4b43dfc..0813006d4eb 100755 --- a/tests/interp/m98m99/12-M99-endless-main-program/test-ui.py +++ b/tests/interp/m98m99/12-M99-endless-main-program/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import hal diff --git a/tests/interp/mdi-oword-m66/test-ui.py b/tests/interp/mdi-oword-m66/test-ui.py index 8efa4806cb1..f923af3d7a9 100755 --- a/tests/interp/mdi-oword-m66/test-ui.py +++ b/tests/interp/mdi-oword-m66/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import linuxcnc_util diff --git a/tests/interp/oword-mdi-sub-update/test-ui.py b/tests/interp/oword-mdi-sub-update/test-ui.py index c83e86ffbee..80fd9e7e69e 100755 --- a/tests/interp/oword-mdi-sub-update/test-ui.py +++ b/tests/interp/oword-mdi-sub-update/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import hal diff --git a/tests/interp/python/error/canon.py b/tests/interp/python/error/canon.py index f07ce67abff..c6ae0d26581 100644 --- a/tests/interp/python/error/canon.py +++ b/tests/interp/python/error/canon.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import tempfile import gcode import sys diff --git a/tests/interp/subroutine-return/test-ui.py b/tests/interp/subroutine-return/test-ui.py index e168188d877..df8769d3b9a 100755 --- a/tests/interp/subroutine-return/test-ui.py +++ b/tests/interp/subroutine-return/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import linuxcnc_util diff --git a/tests/io-startup/test-ui.py b/tests/io-startup/test-ui.py index b4a19698d4e..d46c5a1fd6d 100755 --- a/tests/io-startup/test-ui.py +++ b/tests/io-startup/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc_util import hal diff --git a/tests/lathe/test-ui.py b/tests/lathe/test-ui.py index dfe66b75236..c7ba523fd5c 100755 --- a/tests/lathe/test-ui.py +++ b/tests/lathe/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import linuxcnc_util diff --git a/tests/limit3/checkresult b/tests/limit3/checkresult index 67fad1abf38..7e7bc14005a 100755 --- a/tests/limit3/checkresult +++ b/tests/limit3/checkresult @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import sys, os, re, math diff --git a/tests/limit3/sunny-day/checkresult b/tests/limit3/sunny-day/checkresult index abaa78fe4bb..8e89aaadb14 100755 --- a/tests/limit3/sunny-day/checkresult +++ b/tests/limit3/sunny-day/checkresult @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import sys import math diff --git a/tests/mdi-queue-length/test-ui.py b/tests/mdi-queue-length/test-ui.py index 00a317d9ed2..037fdd73fd7 100755 --- a/tests/mdi-queue-length/test-ui.py +++ b/tests/mdi-queue-length/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import hal diff --git a/tests/mdi-while-queuebuster-waitflag/remap.py b/tests/mdi-while-queuebuster-waitflag/remap.py index c72590d5a86..99568f87127 100644 --- a/tests/mdi-while-queuebuster-waitflag/remap.py +++ b/tests/mdi-while-queuebuster-waitflag/remap.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import emccanon import interpreter diff --git a/tests/mdi-while-queuebuster-waitflag/test-ui.py b/tests/mdi-while-queuebuster-waitflag/test-ui.py index 2066780ca13..028f086f255 100755 --- a/tests/mdi-while-queuebuster-waitflag/test-ui.py +++ b/tests/mdi-while-queuebuster-waitflag/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc, hal import sys diff --git a/tests/mdi-while-queuebuster-waitflag/toplevel.py b/tests/mdi-while-queuebuster-waitflag/toplevel.py index 71b06e97c5b..c00d200390b 100755 --- a/tests/mdi-while-queuebuster-waitflag/toplevel.py +++ b/tests/mdi-while-queuebuster-waitflag/toplevel.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import remap def __init__(self): diff --git a/tests/motion-logger/basic/test-ui.py b/tests/motion-logger/basic/test-ui.py index 45bf1335ac8..4ab695eef76 100755 --- a/tests/motion-logger/basic/test-ui.py +++ b/tests/motion-logger/basic/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import hal diff --git a/tests/motion-logger/mountaindew/test-ui.py b/tests/motion-logger/mountaindew/test-ui.py index 30d3f3cf5b6..e4310ff6a86 100755 --- a/tests/motion-logger/mountaindew/test-ui.py +++ b/tests/motion-logger/mountaindew/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import hal diff --git a/tests/motion-logger/startup-gcode-abort/test-ui.py b/tests/motion-logger/startup-gcode-abort/test-ui.py index 5e72068c0ab..91cee3564d0 100755 --- a/tests/motion-logger/startup-gcode-abort/test-ui.py +++ b/tests/motion-logger/startup-gcode-abort/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import sys diff --git a/tests/motion/g0/checkresult b/tests/motion/g0/checkresult index 168b0a315cc..8136da7fcc5 100755 --- a/tests/motion/g0/checkresult +++ b/tests/motion/g0/checkresult @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import sys import os diff --git a/tests/motion/jogwheel-axis/test-ui.py b/tests/motion/jogwheel-axis/test-ui.py index 30c8bc4cba6..e66b3ae478c 100755 --- a/tests/motion/jogwheel-axis/test-ui.py +++ b/tests/motion/jogwheel-axis/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import linuxcnc_util diff --git a/tests/motion/jogwheel-joint/test-ui.py b/tests/motion/jogwheel-joint/test-ui.py index 0769495b269..076f659d5df 100755 --- a/tests/motion/jogwheel-joint/test-ui.py +++ b/tests/motion/jogwheel-joint/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import hal diff --git a/tests/pyhal/test b/tests/pyhal/test index 7b74dc4c613..2d8cb930be0 100755 --- a/tests/pyhal/test +++ b/tests/pyhal/test @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 from pyhal import * import os diff --git a/tests/remap/remap-io/test-ui.py b/tests/remap/remap-io/test-ui.py index c22a0edb003..65640490d6f 100755 --- a/tests/remap/remap-io/test-ui.py +++ b/tests/remap/remap-io/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc, hal import sys, os diff --git a/tests/remap/remap-io/toplevel.py b/tests/remap/remap-io/toplevel.py index 3f14e4cc23b..0252d05c5c9 100755 --- a/tests/remap/remap-io/toplevel.py +++ b/tests/remap/remap-io/toplevel.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import remap def __init__(self): diff --git a/tests/remap/remap-reentry/toplevel.py b/tests/remap/remap-reentry/toplevel.py index 71b06e97c5b..c00d200390b 100755 --- a/tests/remap/remap-reentry/toplevel.py +++ b/tests/remap/remap-reentry/toplevel.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import remap def __init__(self): diff --git a/tests/remap/sequencing/permute.py b/tests/remap/sequencing/permute.py index ab6ec089b28..27f1f9403e3 100644 --- a/tests/remap/sequencing/permute.py +++ b/tests/remap/sequencing/permute.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 # This is a component of LinuxCNC # Copyright 2011 Michael Haberler # diff --git a/tests/rs274ngc-startup/test-ui.py b/tests/rs274ngc-startup/test-ui.py index 6b3f8ac214c..4640dbd37f8 100755 --- a/tests/rs274ngc-startup/test-ui.py +++ b/tests/rs274ngc-startup/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import linuxcnc_util diff --git a/tests/single-step/test-ui.py b/tests/single-step/test-ui.py index 2468d0443b5..a971561befe 100755 --- a/tests/single-step/test-ui.py +++ b/tests/single-step/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import linuxcnc_util diff --git a/tests/startup-state/test-ui.py b/tests/startup-state/test-ui.py index f7d9740821f..d83b0469a92 100755 --- a/tests/startup-state/test-ui.py +++ b/tests/startup-state/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import linuxcnc_util diff --git a/tests/statbuffer-g5x-abort/test-ui.py b/tests/statbuffer-g5x-abort/test-ui.py index 706cba96e2a..e219b3861d8 100755 --- a/tests/statbuffer-g5x-abort/test-ui.py +++ b/tests/statbuffer-g5x-abort/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import hal diff --git a/tests/threads.0/checkresult b/tests/threads.0/checkresult index 7759fc0e6c4..13a9c52099e 100755 --- a/tests/threads.0/checkresult +++ b/tests/threads.0/checkresult @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import sys l = [int(line.strip()) for line in open(sys.argv[1])] diff --git a/tests/tlo/test-ui.py b/tests/tlo/test-ui.py index 147f38ec2b6..c6c1f5e0402 100755 --- a/tests/tlo/test-ui.py +++ b/tests/tlo/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import hal diff --git a/tests/tool-info/non-random/test-ui.py b/tests/tool-info/non-random/test-ui.py index a8836d62484..a99c9d22c95 100755 --- a/tests/tool-info/non-random/test-ui.py +++ b/tests/tool-info/non-random/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import hal diff --git a/tests/tool-info/random-no-startup-tool/test-ui.py b/tests/tool-info/random-no-startup-tool/test-ui.py index 8407571d27a..31fc74cdba4 100755 --- a/tests/tool-info/random-no-startup-tool/test-ui.py +++ b/tests/tool-info/random-no-startup-tool/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import hal diff --git a/tests/tool-info/random-with-startup-tool/test-ui.py b/tests/tool-info/random-with-startup-tool/test-ui.py index 33cfbefb6d1..c81d11237c1 100755 --- a/tests/tool-info/random-with-startup-tool/test-ui.py +++ b/tests/tool-info/random-with-startup-tool/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import hal diff --git a/tests/toolchanger/m61/test-ui.py b/tests/toolchanger/m61/test-ui.py index 1826c2e74e6..02e7ee1674e 100755 --- a/tests/toolchanger/m61/test-ui.py +++ b/tests/toolchanger/m61/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import hal diff --git a/tests/toolchanger/reload-tool/non-random/test-ui.py b/tests/toolchanger/reload-tool/non-random/test-ui.py index abb3cea695d..36b623fef2b 100755 --- a/tests/toolchanger/reload-tool/non-random/test-ui.py +++ b/tests/toolchanger/reload-tool/non-random/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import linuxcnc_util diff --git a/tests/toolchanger/reload-tool/random/test-ui.py b/tests/toolchanger/reload-tool/random/test-ui.py index b37f4697f20..c89c5a201d2 100755 --- a/tests/toolchanger/reload-tool/random/test-ui.py +++ b/tests/toolchanger/reload-tool/random/test-ui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 import linuxcnc import linuxcnc_util diff --git a/tests/trajectory-planner/circular-arcs/linuxcnc_control.py b/tests/trajectory-planner/circular-arcs/linuxcnc_control.py index 97031f7f83f..140c3ed1ffd 100644 --- a/tests/trajectory-planner/circular-arcs/linuxcnc_control.py +++ b/tests/trajectory-planner/circular-arcs/linuxcnc_control.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 '''Copied from m61-test''' import linuxcnc diff --git a/tests/trajectory-planner/circular-arcs/machine_setup.py b/tests/trajectory-planner/circular-arcs/machine_setup.py index 439fa47ce49..33fa2c02af4 100755 --- a/tests/trajectory-planner/circular-arcs/machine_setup.py +++ b/tests/trajectory-planner/circular-arcs/machine_setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 '''Copied from m61-test''' import linuxcnc diff --git a/tests/trajectory-planner/circular-arcs/run_all_tests.py b/tests/trajectory-planner/circular-arcs/run_all_tests.py index b37328b6d28..79a617a6f77 100644 --- a/tests/trajectory-planner/circular-arcs/run_all_tests.py +++ b/tests/trajectory-planner/circular-arcs/run_all_tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/env linuxcnc-python +#!/usr/bin/env python3 '''Copied from m61-test''' import linuxcnc