markdown: Rename ms_markdown.py -> ms_schema_markdown.py
authorGarming Sam <garming@catalyst.net.nz>
Thu, 23 Nov 2017 04:06:53 +0000 (17:06 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 14 Dec 2017 11:34:03 +0000 (12:34 +0100)
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

python/samba/ms_schema_markdown.py [moved from python/samba/ms_markdown.py with 100% similarity]
python/samba/netcmd/domain.py

index e4dd4708e88913966e8b9595803dfd8bcfde1fbe..6f6ef61c6aaf682710e2a5180738bbafd1d10562 100644 (file)
@@ -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