From 41f67bbe1f7edf92ee543370a64bd5636fade0f7 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 29 Dec 2020 14:50:05 +0100 Subject: [PATCH] sceneeditor: Remove version checks for Python pre-3.0 --- contrib/src/sceneeditor/SideWindow.py | 11 +++-------- contrib/src/sceneeditor/controllerWindow.py | 11 +++-------- contrib/src/sceneeditor/dataHolder.py | 9 ++------- contrib/src/sceneeditor/lightingPanel.py | 10 +++------- contrib/src/sceneeditor/sceneEditor.py | 9 ++------- contrib/src/sceneeditor/seAnimPanel.py | 6 +----- contrib/src/sceneeditor/seBlendAnimPanel.py | 7 +------ contrib/src/sceneeditor/seColorEntry.py | 8 ++------ contrib/src/sceneeditor/seMopathRecorder.py | 13 ++++--------- contrib/src/sceneeditor/seParticlePanel.py | 11 +++-------- contrib/src/sceneeditor/sePlacer.py | 11 +++-------- contrib/src/sceneeditor/seSceneGraphExplorer.py | 11 +++-------- contrib/src/sceneeditor/seTree.py | 10 +++------- 13 files changed, 33 insertions(+), 94 deletions(-) diff --git a/contrib/src/sceneeditor/SideWindow.py b/contrib/src/sceneeditor/SideWindow.py index 96c225c58f..ab90b2f362 100644 --- a/contrib/src/sceneeditor/SideWindow.py +++ b/contrib/src/sceneeditor/SideWindow.py @@ -7,14 +7,9 @@ from direct.tkwidgets.VectorWidgets import ColorEntry from direct.showbase.TkGlobal import spawnTkLoop import seSceneGraphExplorer -import Pmw, sys - -if sys.version_info >= (3, 0): - from tkinter import Frame, IntVar, Checkbutton, Toplevel - import tkinter -else: - from Tkinter import Frame, IntVar, Checkbutton, Toplevel - import Tkinter as tkinter +import Pmw +from tkinter import Frame, IntVar, Checkbutton, Toplevel +import tkinter class sideWindow(AppShell): diff --git a/contrib/src/sceneeditor/controllerWindow.py b/contrib/src/sceneeditor/controllerWindow.py index 03ca35d6d8..3961c28719 100644 --- a/contrib/src/sceneeditor/controllerWindow.py +++ b/contrib/src/sceneeditor/controllerWindow.py @@ -4,14 +4,9 @@ ################################################################# from direct.tkwidgets.AppShell import AppShell -import sys, Pmw - -if sys.version_info >= (3, 0): - from tkinter import Frame, Label, Button - import tkinter -else: - from Tkinter import Frame, Label, Button - import Tkinter as tkinter +import Pmw +from tkinter import Frame, Label, Button +import tkinter # Define the Category KEYBOARD = 'Keyboard-' diff --git a/contrib/src/sceneeditor/dataHolder.py b/contrib/src/sceneeditor/dataHolder.py index db196dd233..d153080999 100644 --- a/contrib/src/sceneeditor/dataHolder.py +++ b/contrib/src/sceneeditor/dataHolder.py @@ -2,15 +2,10 @@ # TK and PMW INTERFACE MODULES# ############################### from direct.showbase.TkGlobal import* -import Pmw, sys +import Pmw from direct.tkwidgets import Dial from direct.tkwidgets import Floater - -if sys.version_info >= (3, 0): - from tkinter.filedialog import askopenfilename -else: - from tkFileDialog import askopenfilename - +from tkinter.filedialog import askopenfilename ############################# # Scene Editor Python Files # diff --git a/contrib/src/sceneeditor/lightingPanel.py b/contrib/src/sceneeditor/lightingPanel.py index d3eb2a5c0e..946e247dcc 100644 --- a/contrib/src/sceneeditor/lightingPanel.py +++ b/contrib/src/sceneeditor/lightingPanel.py @@ -7,15 +7,11 @@ from direct.tkwidgets.AppShell import AppShell from seColorEntry import * from direct.tkwidgets.VectorWidgets import Vector3Entry from direct.tkwidgets.Slider import Slider -import sys, Pmw +import Pmw from panda3d.core import * -if sys.version_info >= (3, 0): - from tkinter import Frame, Button, Menubutton, Menu - import tkinter -else: - from Tkinter import Frame, Button, Menubutton, Menu - import Tkinter as tkinter +from tkinter import Frame, Button, Menubutton, Menu +import tkinter class lightingPanel(AppShell): diff --git a/contrib/src/sceneeditor/sceneEditor.py b/contrib/src/sceneeditor/sceneEditor.py index 3c4d291bbd..21039f1f58 100644 --- a/contrib/src/sceneeditor/sceneEditor.py +++ b/contrib/src/sceneeditor/sceneEditor.py @@ -8,13 +8,8 @@ from direct.showbase.ShowBase import ShowBase ShowBase() from direct.showbase.TkGlobal import spawnTkLoop - -if sys.version_info >= (3, 0): - from tkinter import * - from tkinter.filedialog import * -else: - from Tkinter import * - from tkFileDialog import * +from tkinter import * +from tkinter.filedialog import * from direct.directtools.DirectGlobals import * from direct.tkwidgets.AppShell import* diff --git a/contrib/src/sceneeditor/seAnimPanel.py b/contrib/src/sceneeditor/seAnimPanel.py index ec7f8faf21..2b6dd4dbc0 100644 --- a/contrib/src/sceneeditor/seAnimPanel.py +++ b/contrib/src/sceneeditor/seAnimPanel.py @@ -5,13 +5,9 @@ # Import Tkinter, Pmw, and the floater code from this directory tree. from direct.tkwidgets.AppShell import * from direct.showbase.TkGlobal import * -import sys from direct.task import Task -if sys.version_info >= (3, 0): - from tkinter.simpledialog import askfloat -else: - from tkSimpleDialog import askfloat +from tkinter.simpledialog import askfloat FRAMES = 0 SECONDS = 1 diff --git a/contrib/src/sceneeditor/seBlendAnimPanel.py b/contrib/src/sceneeditor/seBlendAnimPanel.py index 27b9c30957..93cdf694d4 100644 --- a/contrib/src/sceneeditor/seBlendAnimPanel.py +++ b/contrib/src/sceneeditor/seBlendAnimPanel.py @@ -5,13 +5,8 @@ # Import Tkinter, Pmw, and the floater code from this directory tree. from direct.tkwidgets.AppShell import * from direct.showbase.TkGlobal import * -import sys from direct.task import Task - -if sys.version_info >= (3, 0): - from tkinter.simpledialog import askfloat -else: - from tkSimpleDialog import askfloat +from tkinter.simpledialog import askfloat FRAMES = 0 SECONDS = 1 diff --git a/contrib/src/sceneeditor/seColorEntry.py b/contrib/src/sceneeditor/seColorEntry.py index 9dcb3136f7..62288893bc 100644 --- a/contrib/src/sceneeditor/seColorEntry.py +++ b/contrib/src/sceneeditor/seColorEntry.py @@ -12,13 +12,9 @@ from direct.tkwidgets import Valuator from direct.tkwidgets import Floater from direct.tkwidgets import Slider -import sys, Pmw +import Pmw from direct.tkwidgets.VectorWidgets import VectorEntry - -if sys.version_info >= (3, 0): - from tkinter.colorchooser import askcolor -else: - from tkColorChooser import askcolor +from tkinter.colorchooser import askcolor class seColorEntry(VectorEntry): diff --git a/contrib/src/sceneeditor/seMopathRecorder.py b/contrib/src/sceneeditor/seMopathRecorder.py index 65edba3880..e189e466ae 100644 --- a/contrib/src/sceneeditor/seMopathRecorder.py +++ b/contrib/src/sceneeditor/seMopathRecorder.py @@ -25,17 +25,12 @@ from direct.tkwidgets.Slider import Slider from direct.tkwidgets.EntryScale import EntryScale from direct.tkwidgets.VectorWidgets import Vector2Entry, Vector3Entry from direct.tkwidgets.VectorWidgets import ColorEntry -import os, sys, Pmw +import os, Pmw import math -if sys.version_info >= (3, 0): - from tkinter import Button, Frame, Radiobutton, Checkbutton, Label - from tkinter import StringVar, BooleanVar, Entry, Scale - import tkinter -else: - from Tkinter import Button, Frame, Radiobutton, Checkbutton, Label - from Tkinter import StringVar, BooleanVar, Entry, Scale - import Tkinter as tkinter +from tkinter import Button, Frame, Radiobutton, Checkbutton, Label +from tkinter import StringVar, BooleanVar, Entry, Scale +import tkinter PRF_UTILITIES = [ diff --git a/contrib/src/sceneeditor/seParticlePanel.py b/contrib/src/sceneeditor/seParticlePanel.py index 3c359e2628..6ea49cc3b1 100644 --- a/contrib/src/sceneeditor/seParticlePanel.py +++ b/contrib/src/sceneeditor/seParticlePanel.py @@ -2,7 +2,7 @@ # Import Tkinter, Pmw, and the floater code from this directory tree. from direct.tkwidgets.AppShell import AppShell -import os, Pmw, sys +import os, Pmw from direct.tkwidgets.Dial import AngleDial from direct.tkwidgets.Floater import Floater from direct.tkwidgets.Slider import Slider @@ -13,13 +13,8 @@ import seForceGroup import seParticles import seParticleEffect - -if sys.version_info >= (3, 0): - from tkinter.filedialog import * - from tkinter.simpledialog import askstring -else: - from tkFileDialog import * - from tkSimpleDialog import askstring +from tkinter.filedialog import * +from tkinter.simpledialog import askstring class ParticlePanel(AppShell): diff --git a/contrib/src/sceneeditor/sePlacer.py b/contrib/src/sceneeditor/sePlacer.py index 15804629a7..e8f397c614 100644 --- a/contrib/src/sceneeditor/sePlacer.py +++ b/contrib/src/sceneeditor/sePlacer.py @@ -6,14 +6,9 @@ from direct.tkwidgets.AppShell import AppShell from direct.tkwidgets.Dial import AngleDial from direct.tkwidgets.Floater import Floater from panda3d.core import * -import sys, Pmw - -if sys.version_info >= (3, 0): - from tkinter import Button, Menubutton, Menu, StringVar - import tkinter -else: - from Tkinter import Button, Menubutton, Menu, StringVar - import Tkinter as tkinter +import Pmw +from tkinter import Button, Menubutton, Menu, StringVar +import tkinter """ TODO: diff --git a/contrib/src/sceneeditor/seSceneGraphExplorer.py b/contrib/src/sceneeditor/seSceneGraphExplorer.py index 163287965c..1281a57604 100644 --- a/contrib/src/sceneeditor/seSceneGraphExplorer.py +++ b/contrib/src/sceneeditor/seSceneGraphExplorer.py @@ -11,14 +11,9 @@ from direct.showbase.DirectObject import DirectObject from seTree import TreeNode, TreeItem -import Pmw, sys - -if sys.version_info >= (3, 0): - from tkinter import IntVar, Frame, Label - import tkinter -else: - from Tkinter import IntVar, Frame, Label - import Tkinter as tkinter +import Pmw +from tkinter import IntVar, Frame, Label +import tkinter # changing these strings requires changing sceneEditor.py SGE_ strs too! # This list of items will be showed on the pop out window when user right click on diff --git a/contrib/src/sceneeditor/seTree.py b/contrib/src/sceneeditor/seTree.py index 81c108fcf3..f195002211 100644 --- a/contrib/src/sceneeditor/seTree.py +++ b/contrib/src/sceneeditor/seTree.py @@ -12,16 +12,12 @@ # ################################################################# -import os, sys, Pmw +import os, Pmw from direct.showbase.DirectObject import DirectObject from panda3d.core import * -if sys.version_info >= (3, 0): - import tkinter - from tkinter import IntVar, Menu, PhotoImage, Label, Frame, Entry -else: - import Tkinter as tkinter - from Tkinter import IntVar, Menu, PhotoImage, Label, Frame, Entry +import tkinter +from tkinter import IntVar, Menu, PhotoImage, Label, Frame, Entry # Initialize icon directory ICONDIR = getModelPath().findFile(Filename('icons')).toOsSpecific()