X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=argparse_utils.py;h=3799a47ccbc1a34a599cdd443eaf5dfa33a64772;hb=899f6e9e9120466edb8fd93844aeddac460de916;hp=80046dee7b2c4619406bfec618d131df24d1e5c3;hpb=3bc4daf1edc121cd633429187392227f2fa61885;p=python_utils.git diff --git a/argparse_utils.py b/argparse_utils.py index 80046de..3799a47 100644 --- a/argparse_utils.py +++ b/argparse_utils.py @@ -5,7 +5,8 @@ import datetime import logging import os -import string_utils +# This module is commonly used by others in here and should avoid +# taking any unnecessary dependencies back on them. logger = logging.getLogger(__name__) @@ -58,11 +59,13 @@ class ActionNoYes(argparse.Action): def valid_bool(v): if isinstance(v, bool): return v - return string_utils.to_bool(v) + from string_utils import to_bool + return to_bool(v) def valid_ip(ip: str) -> str: - s = string_utils.extract_ip_v4(ip.strip()) + from string_utils import extract_ip_v4 + s = extract_ip_v4(ip.strip()) if s is not None: return s msg = f"{ip} is an invalid IP address" @@ -71,7 +74,8 @@ def valid_ip(ip: str) -> str: def valid_mac(mac: str) -> str: - s = string_utils.extract_mac_address(mac) + from string_utils import extract_mac_address + s = extract_mac_address(mac) if s is not None: return s msg = f"{mac} is an invalid MAC address" @@ -99,7 +103,8 @@ def valid_filename(filename: str) -> str: def valid_date(txt: str) -> datetime.date: - date = string_utils.to_date(txt) + from string_utils import to_date + date = to_date(txt) if date is not None: return date msg = f'Cannot parse argument as a date: {txt}' @@ -108,7 +113,8 @@ def valid_date(txt: str) -> datetime.date: def valid_datetime(txt: str) -> datetime.datetime: - dt = string_utils.to_datetime(txt) + from string_utils import to_datetime + dt = to_datetime(txt) if dt is not None: return dt msg = f'Cannot parse argument as datetime: {txt}'