From 60e9853bb69f7f1c091d14b7f9f63bd7f852bfa9 Mon Sep 17 00:00:00 2001 From: erinnerim Date: Fri, 10 Sep 2021 17:56:41 -0700 Subject: [PATCH] Revert "importlib refactor lfcli_base.py" This reverts commit 787edf2d511527b0c91132cc47572dcd3af6fce0. --- py-json/LANforge/lfcli_base.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/py-json/LANforge/lfcli_base.py b/py-json/LANforge/lfcli_base.py index 6ed3b034..3b838aa4 100644 --- a/py-json/LANforge/lfcli_base.py +++ b/py-json/LANforge/lfcli_base.py @@ -1,25 +1,22 @@ #!env /usr/bin/python + import sys -import os -import importlib import signal import traceback +# Extend this class to use common set of debug and request features for your script from pprint import pprint import time import random import string import datetime import argparse +import LANforge.LFUtils +from LANforge.LFUtils import * +from LANforge import LFRequest +import LANforge.LFRequest import csv import pandas as pd -import re -# Extend this class to use common set of debug and request features for your script - -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../../"))) - -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -LFRequest = importlib.import_module("lanforge-scripts.py-json.LANforge.LFRequest") +import os class LFCliBase: @@ -204,7 +201,7 @@ class LFCliBase: lf_r.addPostData(_data) if debug_: - LFUtils.debug_printer.pprint(_data) + LANforge.LFUtils.debug_printer.pprint(_data) json_response = lf_r.json_post(show_error=debug_, debug=debug_, response_json_list_=response_json_list_, @@ -242,7 +239,7 @@ class LFCliBase: die_on_error_=self.exit_on_error) lf_r.addPostData(_data) if debug_: - LFUtils.debug_printer.pprint(_data) + LANforge.LFUtils.debug_printer.pprint(_data) json_response = lf_r.json_put(show_error=self.debug, debug=debug_, response_json_list_=response_json_list_,