diff --git a/docs/src/html-latex-images b/docs/src/html-latex-images index 432803ef2f4..fdfba7851b6 100755 --- a/docs/src/html-latex-images +++ b/docs/src/html-latex-images @@ -1,8 +1,6 @@ #!/usr/bin/env linuxcnc-python # vim: sts=4 sw=4 et -from __future__ import absolute_import -from __future__ import print_function import os, shutil, sys, subprocess import tempfile, hashlib import lxml.etree as ET diff --git a/docs/src/image-wildcard b/docs/src/image-wildcard index 8bcf462cd13..f913fc090ff 100755 --- a/docs/src/image-wildcard +++ b/docs/src/image-wildcard @@ -1,7 +1,5 @@ #!/usr/bin/env linuxcnc-python -from __future__ import absolute_import -from __future__ import print_function import os, sys, glob def relpath(path, start): diff --git a/docs/src/links.py b/docs/src/links.py index e7caf68aae8..b3c42425f46 100755 --- a/docs/src/links.py +++ b/docs/src/links.py @@ -1,8 +1,6 @@ #!/usr/bin/env linuxcnc-python # vim: sts=4 sw=4 et -from __future__ import absolute_import -from __future__ import print_function import os, sys try: diff --git a/docs/src/links_db_gen.py b/docs/src/links_db_gen.py index 1e095f8aa2f..c4c814be50c 100755 --- a/docs/src/links_db_gen.py +++ b/docs/src/links_db_gen.py @@ -1,5 +1,4 @@ #!/usr/bin/env linuxcnc-python -from __future__ import print_function import os, sys d = {} diff --git a/docs/src/mkpre.py b/docs/src/mkpre.py index 3e6b8deccd8..46a904c238e 100755 --- a/docs/src/mkpre.py +++ b/docs/src/mkpre.py @@ -6,8 +6,6 @@ License: GPL V2 """ -from __future__ import absolute_import -from __future__ import print_function def substall(s, r): for a, b in r: s = s.replace(a, b) return s diff --git a/lib/python/gladevcp/tooledit_widget.py b/lib/python/gladevcp/tooledit_widget.py index a3a2b581a1b..43a9471b2ac 100644 --- a/lib/python/gladevcp/tooledit_widget.py +++ b/lib/python/gladevcp/tooledit_widget.py @@ -14,7 +14,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -from __future__ import print_function import sys, os, linuxcnc, hashlib datadir = os.path.abspath(os.path.dirname(__file__)) KEYWORDS = ['S','T', 'P', 'X', 'Y', 'Z', 'A', 'B', 'C', 'U', 'V', 'W', 'D', 'I', 'J', 'Q', ';'] diff --git a/lib/python/pyvcp_widgets.py b/lib/python/pyvcp_widgets.py index d606f0eeba6..ce4215a077b 100644 --- a/lib/python/pyvcp_widgets.py +++ b/lib/python/pyvcp_widgets.py @@ -46,7 +46,6 @@ of HAL pin compname.my-led """ -from __future__ import print_function import sys import tkinter as Tkinter from tkinter import * diff --git a/lib/python/rs274/OpenGLTk.py b/lib/python/rs274/OpenGLTk.py index 05760549e2c..d7b915c3497 100755 --- a/lib/python/rs274/OpenGLTk.py +++ b/lib/python/rs274/OpenGLTk.py @@ -11,17 +11,13 @@ from minigl import * import math -import os,sys +import os import _togl import glnav -import sys -if sys.version_info[0] == 3: - from tkinter import _default_root - from tkinter import * -else: - from Tkinter import _default_root - from Tkinter import * +from tkinter import _default_root +from tkinter import * + # Keith Junius provided many changes to Togl TOGL_NORMAL = 1 TOGL_OVERLAY = 2 diff --git a/src/emc/ini/update_ini.py b/src/emc/ini/update_ini.py index 035f1ad6c41..25e43e640e6 100755 --- a/src/emc/ini/update_ini.py +++ b/src/emc/ini/update_ini.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 THIS_VERSION = "1.1" @@ -8,12 +8,9 @@ import linuxcnc import re import datetime -if sys.version_info[0] == 3: - import tkinter - from tkinter import messagebox -else: - import Tkinter as tkinter - import tkMessageBox as messagebox + +import tkinter +from tkinter import messagebox def copysection(block): #Just makes a straight copy of blocks that don't need any work diff --git a/src/emc/usr_intf/axis/scripts/axis.py b/src/emc/usr_intf/axis/scripts/axis.py index 9c8fe7dd668..59ef858e359 100755 --- a/src/emc/usr_intf/axis/scripts/axis.py +++ b/src/emc/usr_intf/axis/scripts/axis.py @@ -19,8 +19,6 @@ # import pdb - -from __future__ import print_function import sys, os import string 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 1edee19836d..eb62cf69f49 100644 --- a/src/emc/usr_intf/axis/scripts/image-to-gcode.py +++ b/src/emc/usr_intf/axis/scripts/image-to-gcode.py @@ -16,7 +16,6 @@ ## image-to-gcode.py is Copyright (C) 2006 Jeff Epler ## jepler@unpy.net -from __future__ import print_function import sys, os BASE = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..")) sys.path.insert(0, os.path.join(BASE, "lib", "python")) @@ -497,10 +496,7 @@ def __call__(self, conv, i0, j0, points): conv.g.set_feed(conv.feed) def ui(im, nim, im_name): - if sys.version_info[0] == 3: - import tkinter - else: - import Tkinter as tkinter + import tkinter try: from PIL import ImageTk diff --git a/src/emc/usr_intf/gscreen/gscreen.py b/src/emc/usr_intf/gscreen/gscreen.py index f5ef764c089..b12667bb883 100755 --- a/src/emc/usr_intf/gscreen/gscreen.py +++ b/src/emc/usr_intf/gscreen/gscreen.py @@ -26,7 +26,6 @@ # this would probably be most useful for user's custom status widgets. # you would need to calibrate your touchscreen to just work on a single screen """ -from __future__ import print_function import sys,os,subprocess def _print_help(): print(""" Gscreen a customizable operator screen for linuxcnc based on pyGTK / GLADE.\n diff --git a/src/hal/drivers/rbf2h.py b/src/hal/drivers/rbf2h.py index 5d92b7a7ce3..e07321dc301 100644 --- a/src/hal/drivers/rbf2h.py +++ b/src/hal/drivers/rbf2h.py @@ -1,4 +1,3 @@ -from __future__ import print_function import sys, getopt GPL=0 diff --git a/src/hal/user_comps/gladevcp.py b/src/hal/user_comps/gladevcp.py index 360ed2da0d3..7218ca8190c 100644 --- a/src/hal/user_comps/gladevcp.py +++ b/src/hal/user_comps/gladevcp.py @@ -33,7 +33,6 @@ -g option allows setting of the initial position of the panel """ -from __future__ import print_function import sys, os, subprocess import traceback import warnings diff --git a/src/hal/user_comps/hal_input.py b/src/hal/user_comps/hal_input.py index d53ae94f12c..640e122129a 100644 --- a/src/hal/user_comps/hal_input.py +++ b/src/hal/user_comps/hal_input.py @@ -15,7 +15,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import print_function import linux_event import sys import os diff --git a/src/hal/user_comps/pyvcp.py b/src/hal/user_comps/pyvcp.py index b51060ec4d4..9b0a99617fa 100755 --- a/src/hal/user_comps/pyvcp.py +++ b/src/hal/user_comps/pyvcp.py @@ -34,7 +34,6 @@ -g option allows setting of the initial size and/or position of the panel """ -from __future__ import print_function import sys, os BASE = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..")) sys.path.insert(0, os.path.join(BASE, "lib", "python"))