Revert "importlib refactor LFUtils.py"

This reverts commit 343d5f7b31.
This commit is contained in:
erinnerim
2021-09-10 17:56:55 -07:00
parent 60e9853bb6
commit c373891f9d

View File

@@ -2,25 +2,21 @@
# Define useful common methods - # Define useful common methods -
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
import sys import sys
import os
import importlib
import pprint
import time
from time import sleep
from random import seed
from random import randint
import re
import ipaddress
seed(int(round(time.time() * 1000)))
if sys.version_info[0] != 3: if sys.version_info[0] != 3:
print("This script requires Python 3") print("This script requires Python 3")
exit() exit()
import os
import pprint
import time
from time import sleep
from random import seed
import re
import ipaddress
if 'lanforge-scripts' not in sys.path: seed(int(round(time.time() * 1000)))
sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../../"))) from random import randint
from LANforge import LFRequest
LFRequest = importlib.import_module("lanforge-scripts.py-json.LANforge.LFRequest")
debug_printer = pprint.PrettyPrinter(indent=2) debug_printer = pprint.PrettyPrinter(indent=2)
@@ -30,8 +26,6 @@ REPORT_TIMER_MS_FAST = 1500
REPORT_TIMER_MS_SLOW = 3000 REPORT_TIMER_MS_SLOW = 3000
#Used for Speed #Used for Speed
def parse_size_bps(size_val): def parse_size_bps(size_val):
if isinstance(size_val, str): if isinstance(size_val, str):
size_val.upper() size_val.upper()