python: sd_utils: pep8 fix spacing around
authorRob van der Linde <rob@catalyst.net.nz>
Thu, 15 Feb 2024 19:01:46 +0000 (08:01 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 1 Mar 2024 04:45:36 +0000 (04:45 +0000)
Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
python/samba/sd_utils.py

index cabbd47b5911d5f39d0d7eb0b3ed15453a9871e8..eace8cf0388722b128152d05213a815df7573878 100644 (file)
@@ -61,7 +61,7 @@ class SDUtils(object):
         else:
             m.dn = Dn(self.ldb, object_dn)
 
-        assert(isinstance(sd, str) or isinstance(sd, security.descriptor))
+        assert (isinstance(sd, str) or isinstance(sd, security.descriptor))
         if isinstance(sd, str):
             tmp_desc = security.descriptor.from_sddl(sd, self.domain_sid)
         elif isinstance(sd, security.descriptor):
@@ -85,18 +85,18 @@ class SDUtils(object):
     def update_aces_in_dacl(self, dn, del_aces=None, add_aces=None,
                             sddl_attr=None, controls=None):
         if del_aces is None:
-            del_aces=[]
+            del_aces = []
         if add_aces is None:
-            add_aces=[]
+            add_aces = []
 
         def ace_from_sddl(ace_sddl):
             ace_sd = security.descriptor.from_sddl("D:" + ace_sddl, self.domain_sid)
-            assert(len(ace_sd.dacl.aces)==1)
+            assert (len(ace_sd.dacl.aces) == 1)
             return ace_sd.dacl.aces[0]
 
         if sddl_attr is None:
             if controls is None:
-                controls=["sd_flags:1:%d" % security.SECINFO_DACL]
+                controls = ["sd_flags:1:%d" % security.SECINFO_DACL]
             sd = self.read_sd_on_dn(dn, controls=controls)
             if not sd.type & security.SEC_DESC_DACL_PROTECTED:
                 # if the DACL is not protected remove all
@@ -117,7 +117,7 @@ class SDUtils(object):
                             pass
         else:
             if controls is None:
-                controls=[]
+                controls = []
             res = self.ldb.search(dn, SCOPE_BASE, None,
                                   [sddl_attr], controls=controls)
             old_sddl = str(res[0][sddl_attr][0])
@@ -131,7 +131,7 @@ class SDUtils(object):
         for ace in del_aces:
             if isinstance(ace, str):
                 ace = ace_from_sddl(ace)
-            assert(isinstance(ace, security.ace))
+            assert (isinstance(ace, security.ace))
 
             if ace.flags & security.SEC_ACE_FLAG_INHERITED_ACE:
                 inherited_ignored.append(ace)
@@ -152,7 +152,7 @@ class SDUtils(object):
                 ace = ace["ace"]
             if isinstance(ace, str):
                 ace = ace_from_sddl(ace)
-            assert(isinstance(ace, security.ace))
+            assert (isinstance(ace, security.ace))
 
             if ace.flags & security.SEC_ACE_FLAG_INHERITED_ACE:
                 inherited_ignored.append(ace)
@@ -190,15 +190,15 @@ class SDUtils(object):
         for ace in ace_sd.dacl.aces:
             add_aces.append({"idx": add_idx, "ace": ace})
             add_idx += 1
-        _,ai,ii = self.update_aces_in_dacl(object_dn, add_aces=add_aces,
-                                           controls=controls)
+        _, ai, ii = self.update_aces_in_dacl(object_dn, add_aces=add_aces,
+                                             controls=controls)
         return ai, ii
 
     def dacl_add_ace(self, object_dn, ace):
         """Add an ACE (or more) to an objects security descriptor
         """
-        _,_ = self.dacl_prepend_aces(object_dn, ace,
-                                     controls=["show_deleted:1"])
+        _, _ = self.dacl_prepend_aces(object_dn, ace,
+                                      controls=["show_deleted:1"])
 
     def dacl_append_aces(self, object_dn, aces, controls=None):
         """Append an ACE (or more) to an objects security descriptor
@@ -207,8 +207,8 @@ class SDUtils(object):
         add_aces = []
         for ace in ace_sd.dacl.aces:
             add_aces.append(ace)
-        _,ai,ii = self.update_aces_in_dacl(object_dn, add_aces=add_aces,
-                                           controls=controls)
+        _, ai, ii = self.update_aces_in_dacl(object_dn, add_aces=add_aces,
+                                             controls=controls)
         return ai, ii
 
     def dacl_delete_aces(self, object_dn, aces, controls=None):
@@ -218,8 +218,8 @@ class SDUtils(object):
         del_aces = []
         for ace in del_sd.dacl.aces:
             del_aces.append(ace)
-        di,_,ii = self.update_aces_in_dacl(object_dn, del_aces=del_aces,
-                                           controls=controls)
+        di, _, ii = self.update_aces_in_dacl(object_dn, del_aces=del_aces,
+                                             controls=controls)
         return di, ii
 
     def get_sd_as_sddl(self, object_dn, controls=None):