Formatting cleanups; use True/False for booleans, unnecessary backslashes, spacing.

3 files changed, 31 insertions, 28 deletions

diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py
index b5cc57c4d90..aa4de660a03 100644
--- a/source4/scripting/python/samba/tests/provision.py
+++ b/source4/scripting/python/samba/tests/provision.py
@@ -40,9 +40,11 @@ def create_dummy_secretsdb(path, lp=None):
     secrets_ldb.transaction_commit()
     return secrets_ldb
 
+
 class ProvisionTestCase(samba.tests.TestCaseInTempDir):
     """Some simple tests for individual functions in the provisioning code.
     """
+
     def test_setup_secretsdb(self):
         path = os.path.join(self.tempdir, "secrets.ldb")
         ldb = setup_secretsdb(path, setup_path, None, None, lp=env_loadparm())
diff --git a/source4/scripting/python/samba/tests/upgradeprovision.py b/source4/scripting/python/samba/tests/upgradeprovision.py
index f0306fe6a1a..e40262b37a1 100644
--- a/source4/scripting/python/samba/tests/upgradeprovision.py
+++ b/source4/scripting/python/samba/tests/upgradeprovision.py
@@ -23,16 +23,13 @@ from samba.upgradehelpers import  (usn_in_range, dn_sort,
                                   construct_existor_expr)
 
 from samba.tests.provision import create_dummy_secretsdb
-from samba.tests import env_loadparm, TestCaseInTempDir
+from samba.tests import TestCaseInTempDir
 from samba import Ldb
 from ldb import SCOPE_SUBTREE
 import samba.tests
 
-lp = env_loadparm()
-
 def dummymessage(a=None, b=None):
-    if 0:
-        print "none"
+    pass
 
 
 class UpgradeProvisionTestCase(TestCaseInTempDir):
@@ -60,7 +57,8 @@ class UpgradeProvisionTestCase(TestCaseInTempDir):
         self.assertEquals(dn_sort("dc=toto,dc=tata",
                                     "cn=foo,dc=toto,dc=tata"), -1)
         self.assertEquals(dn_sort("cn=bar, dc=toto,dc=tata",
-                                    "cn=foo, dc=toto,dc=tata"),-1)
+                                    "cn=foo, dc=toto,dc=tata"), -1)
+
     def test_get_diff_sddl(self):
         sddl = "O:SAG:DUD:AI(A;CIID;RPWPCRCCLCLORCWOWDSW;;;SA)\
 (A;CIID;RP LCLORC;;;AU)(A;CIID;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)S:AI(AU;CIIDSA;WP;;;WD)"
@@ -75,19 +73,19 @@ class UpgradeProvisionTestCase(TestCaseInTempDir):
         sddl5 = "O:SAG:DUD:AI(A;CIID;RPWPCRCCLCLORCWOWDSW;;;SA)\
 (A;CIID;RP LCLORC;;;AU)(A;CIID;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
 
-        self.assertEquals(get_diff_sddls(sddl, sddl1) ,"")
+        self.assertEquals(get_diff_sddls(sddl, sddl1), "")
         txt = get_diff_sddls(sddl, sddl2)
-        self.assertEquals(txt ,"\tOwner mismatch: SA (in ref) BA(in current)\n")
+        self.assertEquals(txt, "\tOwner mismatch: SA (in ref) BA(in current)\n")
         txt = get_diff_sddls(sddl, sddl3)
-        self.assertEquals(txt ,"\tGroup mismatch: DU (in ref) BA(in current)\n")
+        self.assertEquals(txt, "\tGroup mismatch: DU (in ref) BA(in current)\n")
         txt = get_diff_sddls(sddl, sddl4)
         txtmsg = "\tPart dacl is different between reference and current here\
  is the detail:\n\t\t(A;CIID;RPWPCRCCLCLORCWOWDSW;;;BA) ACE is not present in\
  the reference\n\t\t(A;CIID;RPWPCRCCLCLORCWOWDSW;;;SA) ACE is not present in\
  the current\n"
-        self.assertEquals(txt , txtmsg)
+        self.assertEquals(txt, txtmsg)
         txt = get_diff_sddls(sddl, sddl5)
-        self.assertEquals(txt ,"\tCurrent ACL hasn't a sacl part\n")
+        self.assertEquals(txt, "\tCurrent ACL hasn't a sacl part\n")
 
     def test_construct_existor_expr(self):
         res = construct_existor_expr([])
@@ -99,7 +97,9 @@ class UpgradeProvisionTestCase(TestCaseInTempDir):
         res = construct_existor_expr(["foo", "bar"])
         self.assertEquals(res, "(|(foo=*)(bar=*))")
 
+
 class UpdateSecretsTests(samba.tests.TestCaseInTempDir):
+
     def setUp(self):
         super(UpdateSecretsTests, self).setUp()
         self.referencedb = create_dummy_secretsdb(
diff --git a/source4/scripting/python/samba/tests/upgradeprovisionneeddc.py b/source4/scripting/python/samba/tests/upgradeprovisionneeddc.py
index 32d6c0975b9..3b0a695d839 100644
--- a/source4/scripting/python/samba/tests/upgradeprovisionneeddc.py
+++ b/source4/scripting/python/samba/tests/upgradeprovisionneeddc.py
@@ -20,6 +20,8 @@
 import os
 import re
 import shutil
+
+from samba import param
 from samba.credentials import Credentials
 from samba.auth import system_session
 from samba.provision import getpolicypath
@@ -27,67 +29,66 @@ from samba.upgradehelpers import (get_paths, get_ldbs,
                                  find_provision_key_parameters, identic_rename,
                                  updateOEMInfo, getOEMInfo, update_gpo,
                                  delta_update_basesamdb,search_constructed_attrs_stored)
-
-from samba.tests.provision import create_dummy_secretsdb
-from samba import param
 from samba.tests import env_loadparm, TestCaseInTempDir
+from samba.tests.provision import create_dummy_secretsdb
 import ldb
 
 
 def dummymessage(a=None, b=None):
-    if 0:
-        print "none"
+    pass
 
-lp = env_loadparm()
-smbConfPath = "%s/%s/%s" % (os.environ["SELFTEST_PREFIX"], "dc", "etc/smb.conf")
+smb_conf_path = "%s/%s/%s" % (os.environ["SELFTEST_PREFIX"], "dc", "etc/smb.conf")
 
 class UpgradeProvisionBasicLdbHelpersTestCase(TestCaseInTempDir):
     """Some simple tests for individual functions in the provisioning code.
     """
 
     def test_get_ldbs(self):
-        paths = get_paths(param, None, smbConfPath)
+        paths = get_paths(param, None, smb_conf_path)
         creds = Credentials()
+        lp = env_loadparm()
         creds.guess(lp)
         get_ldbs(paths, creds, system_session(), lp)
 
     def test_find_key_param(self):
-        paths = get_paths(param, None, smbConfPath)
+        paths = get_paths(param, None, smb_conf_path)
         creds = Credentials()
+        lp = env_loadparm()
         creds.guess(lp)
         rootdn = "dc=samba,dc=example,dc=com"
         ldbs = get_ldbs(paths, creds, system_session(), lp)
         names = find_provision_key_parameters(ldbs.sam, ldbs.secrets, ldbs.idmap,
-                                                paths, smbConfPath, lp)
+                                                paths, smb_conf_path, lp)
         self.assertEquals(names.realm, "SAMBA.EXAMPLE.COM")
-        self.assertTrue(str(names.rootdn).lower() == rootdn.lower())
+        self.assertEquals(str(names.rootdn).lower(), rootdn.lower())
         self.assertTrue(names.policyid_dc != None)
         self.assertTrue(names.ntdsguid != "")
 
 
 class UpgradeProvisionWithLdbTestCase(TestCaseInTempDir):
+
     def _getEmptyDbName(self):
         return os.path.join(self.tempdir, "sam.ldb")
 
     def setUp(self):
         super(UpgradeProvisionWithLdbTestCase, self).setUp()
-        paths = get_paths(param, None, smbConfPath)
+        paths = get_paths(param, None, smb_conf_path)
         self.creds = Credentials()
-        self.creds.guess(lp)
+        self.lp = env_loadparm()
+        self.creds.guess(self.lp)
         self.paths = paths
-        self.ldbs = get_ldbs(paths, self.creds, system_session(), lp)
-        self.lp = lp
+        self.ldbs = get_ldbs(paths, self.creds, system_session(), self.lp)
         self.names = find_provision_key_parameters(self.ldbs.sam, self.ldbs.secrets,
-                                                       self.ldbs.idmap, paths, smbConfPath, lp)
+                                   self.ldbs.idmap, paths, smb_conf_path, self.lp)
         self.referencedb = create_dummy_secretsdb(
             os.path.join(self.tempdir, "ref.ldb"))
 
-
     def test_search_constructed_attrs_stored(self):
         hashAtt = search_constructed_attrs_stored(self.ldbs.sam,
                                                   self.names.rootdn,
                                                   ["msds-KeyVersionNumber"])
         self.assertFalse(hashAtt.has_key("msds-KeyVersionNumber"))
+
     def test_identic_rename(self):
         rootdn = "DC=samba,DC=example,DC=com"