s4 upgradeprovision: Restyle imports
authorMatthieu Patou <mat@matws.net>
Wed, 9 Jun 2010 21:00:43 +0000 (01:00 +0400)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 19 Jun 2010 22:43:08 +0000 (00:43 +0200)
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
source4/scripting/bin/upgradeprovision

index c08459a2e4d02c0350150a7c1c42631137042c13..0fc60f1ce20466f3c4674b4985f55d6bc393c19a 100755 (executable)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: expandtab
 #
-# Copyright (C) Matthieu Patou <mat@matws.net> 2009
+# Copyright (C) Matthieu Patou <mat@matws.net> 2009 - 2010
 #
 # Based on provision a Samba4 server by
 # Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007-2008
@@ -37,26 +37,26 @@ import samba
 import samba.getopt as options
 from samba.credentials import DONT_USE_KERBEROS
 from samba.auth import system_session, admin_session
-from ldb import SCOPE_SUBTREE, SCOPE_BASE,\
-                FLAG_MOD_REPLACE, FLAG_MOD_ADD, FLAG_MOD_DELETE,\
-                MessageElement, Message, Dn
+from ldb import (SCOPE_SUBTREE, SCOPE_BASE,
+                FLAG_MOD_REPLACE, FLAG_MOD_ADD, FLAG_MOD_DELETE,
+                MessageElement, Message, Dn)
 from samba import param
 from samba.misc import messageEltFlagToString
-from samba.provision import find_setup_dir, get_domain_descriptor,\
-                            get_config_descriptor, secretsdb_self_join,\
-                            ProvisioningError, getLastProvisionUSN,\
-                            get_max_usn, updateProvisionUSN
+from samba.provision import (find_setup_dir, get_domain_descriptor,
+                            get_config_descriptor, secretsdb_self_join,
+                            ProvisioningError, getLastProvisionUSN,
+                            get_max_usn, updateProvisionUSN)
 from samba.schema import get_linked_attributes, Schema, get_schema_descriptor
 from samba.dcerpc import security, drsblobs
 from samba.ndr import ndr_unpack
 from samba.dcerpc.misc import SEC_CHAN_BDC
-from samba.upgradehelpers import dn_sort, get_paths, newprovision,\
-                                 find_provision_key_parameters, get_ldbs,\
-                                 usn_in_range, identic_rename, get_diff_sddls, \
-                                 update_secrets, CHANGE, ERROR, SIMPLE,\
-                                 CHANGEALL, GUESS, CHANGESD, PROVISION,\
-                                 updateOEMInfo, getOEMInfo, update_gpo,\
-                                 delta_update_basesamdb
+from samba.upgradehelpers import (dn_sort, get_paths, newprovision,
+                                 find_provision_key_parameters, get_ldbs,
+                                 usn_in_range, identic_rename, get_diff_sddls,
+                                 update_secrets, CHANGE, ERROR, SIMPLE,
+                                 CHANGEALL, GUESS, CHANGESD, PROVISION,
+                                 updateOEMInfo, getOEMInfo, update_gpo,
+                                 delta_update_basesamdb)
 
 replace=2**FLAG_MOD_REPLACE
 add=2**FLAG_MOD_ADD