Merge 4fcf93565d into a8cbc93552

klippy/console.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # Script to implement a test console with firmware over serial port
 #
 # Copyright (C) 2016-2021  Kevin O'Connor <kevin@koconnor.net>

klippy/klippy.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # Main code for host side printer firmware
 #
 # Copyright (C) 2016-2024  Kevin O'Connor <kevin@koconnor.net>

scripts/buildcommands.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # Script to handle build time requests embedded in C code.
 #
 # Copyright (C) 2016-2024  Kevin O'Connor <kevin@koconnor.net>

scripts/canbus_query.py

@@ -1,10 +1,10 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # Tool to query CAN bus uuids
 #
 # Copyright (C) 2021  Kevin O'Connor <kevin@koconnor.net>
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
-import sys, os, optparse, time
+import sys, optparse, time
 import can
 
 CANBUS_ID_ADMIN = 0x3f0

scripts/checkstack.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # Script that tries to find how much stack space each function in an
 # object is using.
 #

scripts/graph_temp_sensor.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # Tool to graph temperature sensor ADC resolution
 #
 # Copyright (C) 2020  Kevin O'Connor <kevin@koconnor.net>

scripts/make_version.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # Get the version number for klippy
 #
 # Copyright (C) 2018  Lucas Fink <software@lfcode.ca>

scripts/parsecandump.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 # Check for out of order timestamps in the output of candump
 #
 # Copyright (C) 2023  Kevin O'Connor <kevin@koconnor.net>

scripts/spi_flash/spi_flash.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # Module supporting uploads Klipper firmware to an SD Card via SPI and SDIO
 #
 # Copyright (C) 2021 Eric Callahan <arksine.code@gmail.com>

scripts/stepstats.py

@@ -1,9 +1,10 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # Script to calculate stats for each stepper from a log of messages
 #
 # Copyright (C) 2016  Kevin O'Connor <kevin@koconnor.net>
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
+from __future__ import print_function
 import optparse
 
 def main():
@@ -33,8 +34,8 @@ def main():
             so[2] += 1
             so[{'0': 3, '1': 4}[so[1]]] += int(args['count'])
     for oid, so in sorted([(int(i[0]), i[1]) for i in steppers.items()]):
-        print "oid:%3d dir_cmds:%6d queue_cmds:%7d (%8d -%8d = %8d)" % (
-            oid, so[0], so[2], so[4], so[3], so[4]-so[3])
+        print("oid:%3d dir_cmds:%6d queue_cmds:%7d (%8d -%8d = %8d)" % (
+            oid, so[0], so[2], so[4], so[3], so[4]-so[3]))
 
 if __name__ == '__main__':
     main()

scripts/whconsole.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # Test console for webhooks interface
 #
 # Copyright (C) 2020  Kevin O'Connor <kevin@koconnor.net>