netcmd: user: readpasswords: move show command to readpasswords

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 63e5dc55748f4b85372b406f33a826ccbcda9a47..7d4dfea7ed239d47c1ec755360d1321f410fe612 100644 (file)
--- a/python/samba/netcmd/user/__init__.py
+++ b/python/samba/netcmd/user/__init__.py
@@ -38,13 +38,13 @@ from .getgroups import cmd_user_getgroups
 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 .readpasswords import (cmd_user_getpassword, cmd_user_show,
+                            cmd_user_syncpasswords)
 from .rename import cmd_user_rename
 from .sensitive import cmd_user_sensitive
 from .setexpiry import cmd_user_setexpiry
 from .setpassword import cmd_user_setpassword
 from .setprimarygroup import cmd_user_setprimarygroup
-from .show import cmd_user_show
 from .unlock import cmd_user_unlock
 
 

diff --git a/python/samba/netcmd/user/readpasswords/__init__.py b/python/samba/netcmd/user/readpasswords/__init__.py
index f79454b27d090d9c828b327ac026a795b038b425..75098415ba3c583e82d90292e6018af3838252af 100644 (file)
--- a/python/samba/netcmd/user/readpasswords/__init__.py
+++ b/python/samba/netcmd/user/readpasswords/__init__.py
@@ -41,6 +41,7 @@ from ..common import (
     decrypt_samba_gpg_help,
     virtual_attributes_help
 )
+from .show import cmd_user_show
 
 
 class cmd_user_getpassword(GetPasswordCommand):

diff --git a/python/samba/netcmd/user/show.py b/python/samba/netcmd/user/readpasswords/show.py
similarity index 99%
rename from python/samba/netcmd/user/show.py
rename to python/samba/netcmd/user/readpasswords/show.py
index 1cdec890faf0fb7359f6f9ef4f7fd30c80d922ba..ca5de06effba81322890def8be78c3b267ef54e5 100644 (file)
--- a/python/samba/netcmd/user/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):