From d33f78960d81d4db3d551f61384fe06a6df2ccf4 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Thu, 11 Apr 2019 20:50:21 -0700
Subject: [PATCH] Reduced imports

---
 .bin/Scripts/build-ufd        |  1 +
 .bin/Scripts/functions/ufd.py | 16 +++++++++-------
 .bin/Scripts/settings/ufd.py  | 10 +++++-----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.bin/Scripts/build-ufd b/.bin/Scripts/build-ufd
index 2f7f7451..a2f47a7e 100755
--- a/.bin/Scripts/build-ufd
+++ b/.bin/Scripts/build-ufd
@@ -9,6 +9,7 @@ import sys
 sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from collections import OrderedDict
 from docopt import docopt
+from functions.common import *
 from functions.ufd import *
 from settings.ufd import *
 init_global_vars()
diff --git a/.bin/Scripts/functions/ufd.py b/.bin/Scripts/functions/ufd.py
index 3671a262..e8fb164f 100644
--- a/.bin/Scripts/functions/ufd.py
+++ b/.bin/Scripts/functions/ufd.py
@@ -1,7 +1,9 @@
 # Wizard Kit: Functions - UFD
 
+import os
+import re
+import shutil
 import pathlib
-from functions.common import *
 
 
 def case_insensitive_search(path, item):
@@ -27,11 +29,11 @@ def case_insensitive_search(path, item):
         )
 
   # Done
-  if real_path:
-    return real_path
-  else:
+  if not real_path:
     raise FileNotFoundError('{}/{}'.format(path, item))
 
+  return real_path
+
 
 def find_path(path):
   """Find path case-insensitively, returns pathlib.Path obj."""
@@ -103,7 +105,7 @@ def recursive_copy(source, dest, overwrite=True):
       shutil.copytree(source, dest)
     elif not dest.is_dir():
       # Refusing to replace file with dir
-      raise GenericError('Refusing to replace file with dir: {}'.format(dest))
+      raise FileExistsError('Refusing to replace file: {}'.format(dest))
     else:
       # Dest exists and is a dir, merge dirs
       for item in os.scandir(source):
@@ -114,14 +116,14 @@ def recursive_copy(source, dest, overwrite=True):
       shutil.copy2(source, dest)
     elif not dest.is_file():
       # Refusing to replace dir with file
-      raise GenericError('Refusing to replace dir with file: {}'.format(dest))
+      raise FileExistsError('Refusing to replace dir: {}'.format(dest))
     elif overwrite:
       # Dest file exists, deleting and replacing file
       os.remove(dest)
       shutil.copy2(source, dest)
     else:
       # Refusing to delete file when overwrite=False
-      raise GenericError('Refusing to delete file: {}'.format(dest))
+      raise FileExistsError('Refusing to delete file: {}'.format(dest))
 
 
 if __name__ == '__main__':
diff --git a/.bin/Scripts/settings/ufd.py b/.bin/Scripts/settings/ufd.py
index 4f99018c..13ecd4e9 100644
--- a/.bin/Scripts/settings/ufd.py
+++ b/.bin/Scripts/settings/ufd.py
@@ -1,7 +1,9 @@
-# Wizard Kit: Settings - UFD
+'''Wizard Kit: Settings - UFD'''
+# pylint: disable=C0326,E0611
+# vim: sts=2 sw=2 ts=2
 
 from collections import OrderedDict
-from settings.main import *
+from settings.main import KIT_NAME_FULL,KIT_NAME_SHORT
 
 # General
 DOCSTRING = '''WizardKit: Build UFD
@@ -31,7 +33,7 @@ Options:
 '''
 ISO_LABEL = '{}_LINUX'.format(KIT_NAME_SHORT)
 UFD_LABEL = '{}_UFD'.format(KIT_NAME_SHORT)
-UFD_SOURCES = ({
+UFD_SOURCES = OrderedDict({
   'Linux':            {'Arg': '--linux',          'Type': 'ISO'},
   'Linux (Minimal)':  {'Arg': '--linux-minimal',  'Type': 'ISO'},
   'WinPE':            {'Arg': '--winpe',          'Type': 'ISO'},
@@ -84,5 +86,3 @@ ITEMS = {
 
 if __name__ == '__main__':
   print("This file is not meant to be called directly.")
-
-# vim: sts=2 sw=2 ts=2