From 343d5f7b310de4b7e55dda23f6a03e82ca6e9457 Mon Sep 17 00:00:00 2001 From: erinnerim Date: Fri, 10 Sep 2021 17:07:20 -0700 Subject: [PATCH] importlib refactor LFUtils.py --- py-json/LANforge/LFUtils.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/py-json/LANforge/LFUtils.py b/py-json/LANforge/LFUtils.py index 0b1b4f62..413aaf9d 100644 --- a/py-json/LANforge/LFUtils.py +++ b/py-json/LANforge/LFUtils.py @@ -2,21 +2,25 @@ # Define useful common methods - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - import sys - -if sys.version_info[0] != 3: - print("This script requires Python 3") - exit() 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))) -from random import randint -from LANforge import LFRequest + +if sys.version_info[0] != 3: + print("This script requires Python 3") + exit() + +if 'lanforge-scripts' not in sys.path: + sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../../"))) + +LFRequest = importlib.import_module("lanforge-scripts.py-json.LANforge.LFRequest") debug_printer = pprint.PrettyPrinter(indent=2) @@ -26,6 +30,8 @@ REPORT_TIMER_MS_FAST = 1500 REPORT_TIMER_MS_SLOW = 3000 #Used for Speed + + def parse_size_bps(size_val): if isinstance(size_val, str): size_val.upper()