Revert "Fix for module level import not at top of file"
This reverts commit 47375aa789dcb11ba969895f61dfb12a773e2164.
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
Change-Id: Icc40562b861262d8fb72d68b43654334985eea4d
diff --git a/bin/generate_inventory b/bin/generate_inventory
index 80f725e..3654682 100755
--- a/bin/generate_inventory
+++ b/bin/generate_inventory
@@ -3,9 +3,6 @@
Generate an inventory variable file containing a list of properties
fields from the YAML phosphor-dbus-interfaces repository.
"""
-
-from gen_print import *
-
import sys
import os
import yaml
@@ -13,6 +10,7 @@
lib_path = sys.path[0] + "/../lib"
sys.path.insert(0, lib_path)
+from gen_print import *
# This list will be longer when more development codes are available.
inventory_items = ['fru', 'core', 'fan', 'fan_wc', 'gpu']
diff --git a/bin/generate_testsuite_info.py b/bin/generate_testsuite_info.py
index 6392145..7cafd1e 100755
--- a/bin/generate_testsuite_info.py
+++ b/bin/generate_testsuite_info.py
@@ -5,15 +5,14 @@
Refer to https://robot-framework.readthedocs.io/en/3.0.1/autodoc/robot.parsing.html
"""
+import sys
+import os
+from robot.parsing.model import TestData
+sys.path.append(os.path.join(os.path.dirname(__file__), "../lib"))
+
from gen_arg import *
from gen_print import *
from gen_valid import *
-from robot.parsing.model import TestData
-
-import sys
-import os
-
-sys.path.append(os.path.join(os.path.dirname(__file__), "../lib"))
# Set exit_on_error for gen_valid functions.
set_exit_on_error(True)
diff --git a/bin/obmc_ser_num b/bin/obmc_ser_num
index 8d86099..ba620c8 100755
--- a/bin/obmc_ser_num
+++ b/bin/obmc_ser_num
@@ -4,10 +4,6 @@
This program will get the system serial number from an OBMC machine and print it to stdout.
"""
-from gen_arg import *
-from gen_print import *
-from gen_valid import *
-
import sys
import os
import requests
@@ -15,6 +11,10 @@
save_path_0 = sys.path[0]
del sys.path[0]
+from gen_arg import *
+from gen_print import *
+from gen_valid import *
+
# Restore sys.path[0].
sys.path.insert(0, save_path_0)
diff --git a/bin/print_ffdc_functions b/bin/print_ffdc_functions
index 325fa06..dd46bc6 100755
--- a/bin/print_ffdc_functions
+++ b/bin/print_ffdc_functions
@@ -4,16 +4,16 @@
See help text for details.
"""
-from gen_arg import *
-from gen_print import *
-from gen_valid import *
-from openbmc_ffdc_list import *
-
import sys
save_path_0 = sys.path[0]
del sys.path[0]
+from gen_arg import *
+from gen_print import *
+from gen_valid import *
+from openbmc_ffdc_list import *
+
# Restore sys.path[0].
sys.path.insert(0, save_path_0)
diff --git a/bin/prop_call.py b/bin/prop_call.py
index e167fa5..15cff57 100755
--- a/bin/prop_call.py
+++ b/bin/prop_call.py
@@ -16,18 +16,18 @@
my_program --test_mode=y --quiet=n file1 file2 file3
"""
-from gen_arg import *
-from gen_print import *
-from gen_valid import *
-from gen_misc import *
-from gen_cmd import *
-
import sys
import os
save_path_0 = sys.path[0]
del sys.path[0]
+from gen_arg import *
+from gen_print import *
+from gen_valid import *
+from gen_misc import *
+from gen_cmd import *
+
# Restore sys.path[0].
sys.path.insert(0, save_path_0)
diff --git a/bin/validate_plug_ins.py b/bin/validate_plug_ins.py
index 78e65e5..a202d2e 100755
--- a/bin/validate_plug_ins.py
+++ b/bin/validate_plug_ins.py
@@ -1,18 +1,12 @@
#!/usr/bin/env python3
-
-from gen_print import *
-from gen_arg import *
-from gen_plug_in import *
-
import sys
-import os
-
try:
import __builtin__
except ImportError:
import builtins as __builtin__
+import os
# python puts the program's directory path in sys.path[0]. In other words, the user ordinarily has no way
# to override python's choice of a module from its own dir. We want to have that ability in our environment.
@@ -23,6 +17,10 @@
save_path_0 = sys.path[0]
del sys.path[0]
+from gen_print import *
+from gen_arg import *
+from gen_plug_in import *
+
# Restore sys.path[0].
sys.path.insert(0, save_path_0)
diff --git a/bin/websocket_monitor.py b/bin/websocket_monitor.py
index 712b0ee..846ccd5 100755
--- a/bin/websocket_monitor.py
+++ b/bin/websocket_monitor.py
@@ -4,10 +4,6 @@
See help text for details.
"""
-from gen_print import *
-from gen_arg import *
-from gen_valid import *
-
import json
import sys
import websocket
@@ -18,6 +14,10 @@
save_path_0 = sys.path[0]
del sys.path[0]
+from gen_print import *
+from gen_arg import *
+from gen_valid import *
+
# Restore sys.path[0].
sys.path.insert(0, save_path_0)