diff options
author | Tim Beale <timbeale@catalyst.net.nz> | 2019-01-09 10:15:49 +1300 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2019-01-09 14:30:31 +0100 |
commit | a9def5c6971fa1dea3aaa2da0e5dfd9246dd0c87 (patch) | |
tree | ac7c50258612c4a7bde571f8c3f3f29a9ae822e3 /python | |
parent | 84069c8a5476a47d45ab946d82abb0d6c04635c3 (diff) | |
download | samba-a9def5c6971fa1dea3aaa2da0e5dfd9246dd0c87.tar.gz |
s3:libsmb: Revert SMB Py bindings name back to libsmb_samba_internal
In order to make it clear that the APIs in these Python bindings are
unstable and should not be used by external consumers, this patch
changes the name of the Python bindings back to libsmb_samba_internal.
To make the Python code that uses these bindings (i.e. samba-tool, etc)
look a little cleaner, we can just change the module name as we import
it, e.g.
from samba.samba3 import libsmb_samba_internal as libsmb
Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Wed Jan 9 14:30:31 CET 2019 on sn-devel-144
Diffstat (limited to 'python')
-rw-r--r-- | python/samba/ntacls.py | 2 | ||||
-rw-r--r-- | python/samba/tests/dcerpc/raw_testcase.py | 2 | ||||
-rw-r--r-- | python/samba/tests/libsmb.py | 2 | ||||
-rw-r--r-- | python/samba/tests/smb.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/python/samba/ntacls.py b/python/samba/ntacls.py index 1ab5fd36e15..99245737529 100644 --- a/python/samba/ntacls.py +++ b/python/samba/ntacls.py @@ -32,7 +32,7 @@ from samba.samba3 import param as s3param from samba.dcerpc import security, xattr, idmap from samba.ndr import ndr_pack, ndr_unpack from samba.samba3 import smbd -from samba.samba3 import libsmb +from samba.samba3 import libsmb_samba_internal as libsmb # don't include volumes SMB_FILE_ATTRIBUTE_FLAGS = libsmb.FILE_ATTRIBUTE_SYSTEM | \ diff --git a/python/samba/tests/dcerpc/raw_testcase.py b/python/samba/tests/dcerpc/raw_testcase.py index 4f3f9992549..fc1c86a1283 100644 --- a/python/samba/tests/dcerpc/raw_testcase.py +++ b/python/samba/tests/dcerpc/raw_testcase.py @@ -35,7 +35,7 @@ from samba.ntstatus import ( ) from samba import NTSTATUSError from samba.samba3 import param as s3param -from samba.samba3 import libsmb +from samba.samba3 import libsmb_samba_internal as libsmb class smb_pipe_socket(object): diff --git a/python/samba/tests/libsmb.py b/python/samba/tests/libsmb.py index 5a37b09978b..e8f8e7fe94d 100644 --- a/python/samba/tests/libsmb.py +++ b/python/samba/tests/libsmb.py @@ -17,7 +17,7 @@ """Tests for samba.samba3.libsmb.""" -from samba.samba3 import libsmb +from samba.samba3 import libsmb_samba_internal as libsmb from samba.dcerpc import security from samba.samba3 import param as s3param from samba import credentials diff --git a/python/samba/tests/smb.py b/python/samba/tests/smb.py index fcb0b7fd7b8..5a52885c2f4 100644 --- a/python/samba/tests/smb.py +++ b/python/samba/tests/smb.py @@ -22,7 +22,7 @@ import sys from samba import NTSTATUSError from samba.ntstatus import (NT_STATUS_OBJECT_NAME_NOT_FOUND, NT_STATUS_OBJECT_PATH_NOT_FOUND) -from samba.samba3 import libsmb +from samba.samba3 import libsmb_samba_internal as libsmb from samba.samba3 import param as s3param PY3 = sys.version_info[0] == 3 |