Removed old python2 imports

This commit is contained in:
Simon Beginn 2020-06-25 10:11:57 +02:00
parent 2d13c03da9
commit d8b420fe4c
3 changed files with 12 additions and 42 deletions

View File

@ -4,22 +4,11 @@ import os
import sys import sys
import threading import threading
from time import sleep from time import sleep
import tkinter as tk
try: from tkinter import ttk
# Python 2.x imports from tkinter import messagebox
import Tkinter as tk from tkinter import filedialog
import ttk import tkinter.font as tkFont
import tkMessageBox as messagebox
import tkFileDialog as filedialog
import tkFont
except ImportError:
# Python 3.x imports
import tkinter as tk
from tkinter import ttk
from tkinter import messagebox
from tkinter import filedialog
import tkinter.font as tkFont
from pykms_Server import srv_options, srv_version, srv_config, server_terminate, serverqueue, serverthread from pykms_Server import srv_options, srv_version, srv_config, server_terminate, serverqueue, serverthread
from pykms_GuiMisc import ToolTip, TextDoubleScroll, TextRedirect, custom_background from pykms_GuiMisc import ToolTip, TextDoubleScroll, TextRedirect, custom_background
from pykms_Client import clt_options, clt_version, clt_config, client_thread from pykms_Client import clt_options, clt_version, clt_config, client_thread

View File

@ -4,18 +4,9 @@ import os
import re import re
import sys import sys
from collections import Counter from collections import Counter
import tkinter as tk
try: from tkinter import ttk
# Python 2.x imports import tkinter.font as tkFont
import Tkinter as tk
import ttk
import tkFont
except ImportError:
# Python 3.x imports
import tkinter as tk
from tkinter import ttk
import tkinter.font as tkFont
from pykms_Format import MsgMap, unshell_message, unformat_message from pykms_Format import MsgMap, unshell_message, unformat_message
#--------------------------------------------------------------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------------------------------------------------------------

View File

@ -10,20 +10,10 @@ import logging
import os import os
import threading import threading
import pickle import pickle
import socketserver
try: import queue as Queue
# Python 2 import. import selectors
import SocketServer as socketserver from time import monotonic as time
import Queue as Queue
import pykms_Selectors as selectors
from pykms_Time import monotonic as time
except ImportError:
# Python 3 import.
import socketserver
import queue as Queue
import selectors
from time import monotonic as time
import pykms_RpcBind, pykms_RpcRequest import pykms_RpcBind, pykms_RpcRequest
from pykms_RpcBase import rpcBase from pykms_RpcBase import rpcBase
from pykms_Dcerpc import MSRPCHeader from pykms_Dcerpc import MSRPCHeader