netcmd: user: readpasswords: move common.py to readpasswords

it only contains code relating to the getpassword 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 7d4dfea7ed239d47c1ec755360d1321f410fe612..e0a0904ae61ffec908fdde0217d1f94eb47ea9fe 100644 (file)
--- 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 75098415ba3c583e82d90292e6018af3838252af..0697d9a84161db579c8a134becde9f88b1aecf13 100644 (file)
--- 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 ca5de06effba81322890def8be78c3b267ef54e5..1cdec890faf0fb7359f6f9ef4f7fd30c80d922ba 100644 (file)
--- 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):