diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-03-21 13:34:26 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-03-25 10:32:11 +0100 |
| commit | 352aff8ed7e06c14b7a00a56b31c79ffddf71dd4 (patch) | |
| tree | e8987e4ac3db1a7c05536c19778315b6ce4316eb /python | |
| parent | e81a97dd6fc2da701f2cbf42513311a7a44adad3 (diff) | |
| download | samba-352aff8ed7e06c14b7a00a56b31c79ffddf71dd4.tar.gz samba-352aff8ed7e06c14b7a00a56b31c79ffddf71dd4.tar.bz2 samba-352aff8ed7e06c14b7a00a56b31c79ffddf71dd4.zip | |
scripting: Move samba.provision.descriptor to samba.descriptor
This will allow dbcheck to import it, without a cirucular dependency via
samba.provision importing dbcheck.
Andrew Bartlett
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/descriptor.py (renamed from python/samba/provision/descriptor.py) | 0 | ||||
| -rw-r--r-- | python/samba/provision/__init__.py | 2 | ||||
| -rw-r--r-- | python/samba/provision/sambadns.py | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/python/samba/provision/descriptor.py b/python/samba/descriptor.py index 9916a22e5e..9916a22e5e 100644 --- a/python/samba/provision/descriptor.py +++ b/python/samba/descriptor.py diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index aac0ee36b2..ee4cc10dca 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -76,7 +76,7 @@ from samba.provision.backend import ( LDBBackend, OpenLDAPBackend, ) -from samba.provision.descriptor import ( +from samba.descriptor import ( get_empty_descriptor, get_config_descriptor, get_config_partitions_descriptor, diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py index 4522683fe8..a5a45cf494 100644 --- a/python/samba/provision/sambadns.py +++ b/python/samba/provision/sambadns.py @@ -36,7 +36,7 @@ from samba.dsdb import ( DS_DOMAIN_FUNCTION_2003, DS_DOMAIN_FUNCTION_2008_R2 ) -from samba.provision.descriptor import ( +from samba.descriptor import ( get_domain_descriptor, get_domain_delete_protected1_descriptor, get_domain_delete_protected2_descriptor, |