From 2646eb7bfb1bf9c811298c04ed38e65857082f41 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Thu, 11 May 2023 15:30:20 -0700 Subject: [PATCH] Imports from vendored win_lgpo instead of upstream module --- _modules/ash_win_lgpo.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/_modules/ash_win_lgpo.py b/_modules/ash_win_lgpo.py index 3f27212..eeab86c 100644 --- a/_modules/ash_win_lgpo.py +++ b/_modules/ash_win_lgpo.py @@ -47,12 +47,16 @@ import salt.utils.files - from salt.modules.win_lgpo import ( + from .win_lgpo import ( _policy_info, _transform_value, _read_regpol_file, _write_regpol_data, _regexSearchRegPolData, ) - from salt.ext import six + try: + from salt.ext import six + except ImportError: + import six + from salt.utils.functools import namespaced_function as _namespaced_function from salt.utils.stringutils import to_num from salt.utils.win_reg import Registry