netcmd: user: readpasswords: turn getpassword.py into readpasswords module

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/netcmd/user/__init__.py b/python/samba/netcmd/user/__init__.py
index 204dd45f0e603f92a575a8bd2d7f4ea6d627ef2d..63e5dc55748f4b85372b406f33a826ccbcda9a47 100644 (file)
--- a/python/samba/netcmd/user/__init__.py
+++ b/python/samba/netcmd/user/__init__.py
@@ -35,10 +35,10 @@ from .disable import cmd_user_disable
 from .edit import cmd_user_edit
 from .enable import cmd_user_enable
 from .getgroups import cmd_user_getgroups
-from .getpassword import cmd_user_getpassword, cmd_user_syncpasswords
 from .list import cmd_user_list
 from .move import cmd_user_move
 from .password import cmd_user_password
+from .readpasswords import cmd_user_getpassword, cmd_user_syncpasswords
 from .rename import cmd_user_rename
 from .sensitive import cmd_user_sensitive
 from .setexpiry import cmd_user_setexpiry

diff --git a/python/samba/netcmd/user/getpassword.py b/python/samba/netcmd/user/readpasswords/__init__.py
similarity index 99%
rename from python/samba/netcmd/user/getpassword.py
rename to python/samba/netcmd/user/readpasswords/__init__.py
index 07b1a8e545f745b6780f254cbdf79022bfd12747..f79454b27d090d9c828b327ac026a795b038b425 100644 (file)
--- a/python/samba/netcmd/user/getpassword.py
+++ b/python/samba/netcmd/user/readpasswords/__init__.py
@@ -1,6 +1,6 @@
 # user management
 #
-# user syncpasswords command
+# user readpasswords commands
 #
 # Copyright Jelmer Vernooij 2010 <jelmer@samba.org>
 # Copyright Theresa Halloran 2011 <theresahalloran@gmail.com>
@@ -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,