From c96e2f252c80166acc2863a8df0e3e9ef6316858 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Thu, 27 Dec 2018 21:38:25 -0700 Subject: [PATCH] Cleaned up imports --- .bin/Scripts/functions/browsers.py | 1 - .bin/Scripts/functions/common.py | 3 +-- .bin/Scripts/functions/data.py | 3 +-- .bin/Scripts/functions/ddrescue.py | 1 - .bin/Scripts/functions/info.py | 4 +--- .bin/Scripts/functions/network.py | 3 --- .bin/Scripts/functions/setup.py | 1 - .bin/Scripts/functions/update.py | 1 - 8 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.bin/Scripts/functions/browsers.py b/.bin/Scripts/functions/browsers.py index e73399bc..34c0252f 100644 --- a/.bin/Scripts/functions/browsers.py +++ b/.bin/Scripts/functions/browsers.py @@ -1,7 +1,6 @@ # Wizard Kit: Functions - Browsers from functions.common import * - from operator import itemgetter diff --git a/.bin/Scripts/functions/common.py b/.bin/Scripts/functions/common.py index a0a87b76..368ce687 100644 --- a/.bin/Scripts/functions/common.py +++ b/.bin/Scripts/functions/common.py @@ -14,11 +14,10 @@ except ModuleNotFoundError: if psutil.WINDOWS: raise -from subprocess import CalledProcessError - from settings.main import * from settings.tools import * from settings.windows_builds import * +from subprocess import CalledProcessError # Global variables diff --git a/.bin/Scripts/functions/data.py b/.bin/Scripts/functions/data.py index a151b24c..7dcee3cf 100644 --- a/.bin/Scripts/functions/data.py +++ b/.bin/Scripts/functions/data.py @@ -3,9 +3,8 @@ import ctypes import json -from operator import itemgetter - from functions.common import * +from operator import itemgetter # STATIC VARIABLES diff --git a/.bin/Scripts/functions/ddrescue.py b/.bin/Scripts/functions/ddrescue.py index e6def7f2..a2b27e5e 100644 --- a/.bin/Scripts/functions/ddrescue.py +++ b/.bin/Scripts/functions/ddrescue.py @@ -9,7 +9,6 @@ import stat import time from collections import OrderedDict -from functions.common import * from functions.data import * from functions.hw_diags import * from functions.tmux import * diff --git a/.bin/Scripts/functions/info.py b/.bin/Scripts/functions/info.py index adee5f80..ad71bce7 100644 --- a/.bin/Scripts/functions/info.py +++ b/.bin/Scripts/functions/info.py @@ -1,10 +1,8 @@ # Wizard Kit: Functions - Information from borrowed import knownpaths -from operator import itemgetter - -from functions.common import * from functions.activation import * +from operator import itemgetter # STATIC VARIABLES diff --git a/.bin/Scripts/functions/network.py b/.bin/Scripts/functions/network.py index 9d9b7af1..f210a2b0 100644 --- a/.bin/Scripts/functions/network.py +++ b/.bin/Scripts/functions/network.py @@ -6,9 +6,6 @@ import os import shutil import sys -# Init -os.chdir(os.path.dirname(os.path.realpath(__file__))) -sys.path.append(os.getcwd()) from functions.common import * diff --git a/.bin/Scripts/functions/setup.py b/.bin/Scripts/functions/setup.py index 749058e3..85943d2e 100644 --- a/.bin/Scripts/functions/setup.py +++ b/.bin/Scripts/functions/setup.py @@ -1,6 +1,5 @@ # Wizard Kit: Functions - Setup -from functions.common import * from functions.update import * diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py index 439bb6bf..b4aa3f7e 100644 --- a/.bin/Scripts/functions/update.py +++ b/.bin/Scripts/functions/update.py @@ -2,7 +2,6 @@ import requests -from functions.common import * from functions.data import * from settings.launchers import * from settings.music import *