diff --git a/py-kms/pykms_GuiBase.py b/py-kms/pykms_GuiBase.py index 72df2cc..be931b4 100644 --- a/py-kms/pykms_GuiBase.py +++ b/py-kms/pykms_GuiBase.py @@ -4,22 +4,11 @@ import os import sys import threading from time import sleep - -try: - # Python 2.x imports - import Tkinter as tk - import ttk - 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 - +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_GuiMisc import ToolTip, TextDoubleScroll, TextRedirect, custom_background from pykms_Client import clt_options, clt_version, clt_config, client_thread diff --git a/py-kms/pykms_GuiMisc.py b/py-kms/pykms_GuiMisc.py index 74bcb64..0b2f23f 100644 --- a/py-kms/pykms_GuiMisc.py +++ b/py-kms/pykms_GuiMisc.py @@ -4,18 +4,9 @@ import os import re import sys from collections import Counter - -try: - # Python 2.x imports - 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 - +import tkinter as tk +from tkinter import ttk +import tkinter.font as tkFont from pykms_Format import MsgMap, unshell_message, unformat_message #--------------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/py-kms/pykms_Server.py b/py-kms/pykms_Server.py index 883d0de..2a2b9e4 100755 --- a/py-kms/pykms_Server.py +++ b/py-kms/pykms_Server.py @@ -10,20 +10,10 @@ import logging import os import threading import pickle - -try: - # Python 2 import. - import SocketServer as socketserver - 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 socketserver +import queue as Queue +import selectors +from time import monotonic as time import pykms_RpcBind, pykms_RpcRequest from pykms_RpcBase import rpcBase from pykms_Dcerpc import MSRPCHeader