diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2017-11-23 17:06:53 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2017-12-14 12:34:03 +0100 |
| commit | 964bc8d19aa695f6c5188ab1a941127a259c0bc8 (patch) | |
| tree | 44cc071c9526227ad5449905f5e8b726fcc5d319 /python | |
| parent | 4f20416b383f11d6f7d30616696a5fdf5b6057a3 (diff) | |
| download | samba-964bc8d19aa695f6c5188ab1a941127a259c0bc8.tar.gz | |
markdown: Rename ms_markdown.py -> ms_schema_markdown.py
We also reduce the scope of the import so that python-markdown is only
required if interacting with 2012 code.
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu Dec 14 12:34:04 CET 2017 on sn-devel-144
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/ms_schema_markdown.py (renamed from python/samba/ms_markdown.py) | 0 | ||||
| -rw-r--r-- | python/samba/netcmd/domain.py | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/python/samba/ms_markdown.py b/python/samba/ms_schema_markdown.py index c695f8bd7f1..c695f8bd7f1 100644 --- a/python/samba/ms_markdown.py +++ b/python/samba/ms_schema_markdown.py diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index e4dd4708e88..6f6ef61c6aa 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -66,7 +66,6 @@ from samba.drs_utils import ( sendDsReplicaSync, drsuapi_connect, drsException, sendRemoveDsServer) from samba import remove_dc, arcfour_encrypt, string_to_byte_array -from samba.ms_markdown import read_ms_markdown from samba.dsdb import ( DS_DOMAIN_FUNCTION_2000, @@ -4046,6 +4045,7 @@ class cmd_domain_schema_upgrade(Command): return count def run(self, **kwargs): + from samba.ms_schema_markdown import read_ms_markdown from samba.schema import Schema updates_allowed_overriden = False |