From 24c567610abdb65cdd645ab82e590142636f9dcf Mon Sep 17 00:00:00 2001 From: Rob van der Linde Date: Tue, 1 Aug 2023 13:19:51 +1200 Subject: [PATCH] netcmd: user: readpasswords: move common.py to readpasswords it only contains code relating to the getpassword module Signed-off-by: Rob van der Linde Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- python/samba/netcmd/user/__init__.py | 9 --------- python/samba/netcmd/user/readpasswords/__init__.py | 2 +- python/samba/netcmd/user/{ => readpasswords}/common.py | 0 python/samba/netcmd/user/readpasswords/show.py | 2 +- 4 files changed, 2 insertions(+), 11 deletions(-) rename python/samba/netcmd/user/{ => readpasswords}/common.py (100%) diff --git a/python/samba/netcmd/user/__init__.py b/python/samba/netcmd/user/__init__.py index 7d4dfea7ed2..e0a0904ae61 100644 --- a/python/samba/netcmd/user/__init__.py +++ b/python/samba/netcmd/user/__init__.py @@ -21,15 +21,6 @@ from samba.netcmd import SuperCommand from .add import cmd_user_add from .add_unix_attrs import cmd_user_add_unix_attrs -from .common import ( - GetPasswordCommand, - disabled_virtual_attributes, - decrypt_samba_gpg_help, - get_crypt_value, - gpg_decrypt, - virtual_attributes, - virtual_attributes_help -) from .delete import cmd_user_delete from .disable import cmd_user_disable from .edit import cmd_user_edit diff --git a/python/samba/netcmd/user/readpasswords/__init__.py b/python/samba/netcmd/user/readpasswords/__init__.py index 75098415ba3..0697d9a8416 100644 --- a/python/samba/netcmd/user/readpasswords/__init__.py +++ b/python/samba/netcmd/user/readpasswords/__init__.py @@ -35,7 +35,7 @@ from samba.ndr import ndr_unpack from samba.common import get_bytes from samba.netcmd import CommandError, Option -from ..common import ( +from .common import ( GetPasswordCommand, gpg_decrypt, decrypt_samba_gpg_help, diff --git a/python/samba/netcmd/user/common.py b/python/samba/netcmd/user/readpasswords/common.py similarity index 100% rename from python/samba/netcmd/user/common.py rename to python/samba/netcmd/user/readpasswords/common.py diff --git a/python/samba/netcmd/user/readpasswords/show.py b/python/samba/netcmd/user/readpasswords/show.py index ca5de06effb..1cdec890faf 100644 --- a/python/samba/netcmd/user/readpasswords/show.py +++ b/python/samba/netcmd/user/readpasswords/show.py @@ -25,7 +25,7 @@ from samba.auth import system_session from samba.netcmd import Option, common from samba.samdb import SamDB -from ..common import GetPasswordCommand +from .common import GetPasswordCommand class cmd_user_show(GetPasswordCommand): -- 2.11.4.GIT