PEP8: better formatting of (CONST1|CONST2)

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/join.py b/python/samba/join.py
index 44bad58c9f4316121ac037b4fdf73a1f9f3c4088..9cab604ec4a26f760d52ab72813af1d60e12a2be 100644 (file)
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -326,7 +326,8 @@ class DCJoinContext(object):
             raise Exception("Could not find domain member account '%s' to promote to a DC, use 'samba-tool domain join' instead'" % ctx.samname)
         if "msDS-krbTgtLink" in res[0] or "serverReferenceBL" in res[0] or "rIDSetReferences" in res[0]:
             raise Exception("Account '%s' appears to be an active DC, use 'samba-tool domain join' if you must re-create this account" % ctx.samname)
-        if (int(res[0]["userAccountControl"][0]) & (samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT |samba.dsdb.UF_SERVER_TRUST_ACCOUNT) == 0):
+        if (int(res[0]["userAccountControl"][0]) & (samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT |
+                                                    samba.dsdb.UF_SERVER_TRUST_ACCOUNT) == 0):
             raise Exception("Account %s is not a domain member or a bare NT4 BDC, use 'samba-tool domain join' instead'" % ctx.samname)
 
         ctx.promote_from_dn = res[0].dn

diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index 7bee4bb2eaae42b93dd33787e7bd7d700540f3d0..f3a17eec6b8b52fc8ec328cdfdcf8063c305d142 100644 (file)
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -902,7 +902,9 @@ class cmd_domain_demote(Command):
 
         olduac = uac
 
-        uac &= ~(UF_SERVER_TRUST_ACCOUNT |UF_TRUSTED_FOR_DELEGATION |UF_PARTIAL_SECRETS_ACCOUNT)
+        uac &= ~(UF_SERVER_TRUST_ACCOUNT |
+                 UF_TRUSTED_FOR_DELEGATION |
+                 UF_PARTIAL_SECRETS_ACCOUNT)
         uac |= UF_WORKSTATION_TRUST_ACCOUNT
 
         msg = ldb.Message()

diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py
index c0394772656f534bb36aaa6713324abc95a7a23d..d0b94ffacc1b26a48c2ffe0df769e253e2785923 100644 (file)
--- a/python/samba/netcmd/gpo.py
+++ b/python/samba/netcmd/gpo.py
@@ -144,7 +144,10 @@ def get_gpo_dn(samdb, gpo):
 
 
 def get_gpo_info(samdb, gpo=None, displayname=None, dn=None,
-                 sd_flags=security.SECINFO_OWNER |security.SECINFO_GROUP |security.SECINFO_DACL |security.SECINFO_SACL):
+                 sd_flags=(security.SECINFO_OWNER |
+                           security.SECINFO_GROUP |
+                           security.SECINFO_DACL |
+                           security.SECINFO_SACL)):
     '''Get GPO information using gpo, displayname or dn'''
 
     policies_dn = samdb.get_default_basedn()
@@ -472,7 +475,9 @@ class cmd_list(Command):
                         continue
 
                     try:
-                        sd_flags = security.SECINFO_OWNER |security.SECINFO_GROUP |security.SECINFO_DACL
+                        sd_flags = (security.SECINFO_OWNER |
+                                    security.SECINFO_GROUP |
+                                    security.SECINFO_DACL)
                         gmsg = self.samdb.search(base=g['dn'], scope=ldb.SCOPE_BASE,
                                                  attrs=['name', 'displayName', 'flags',
                                                         'nTSecurityDescriptor'],

diff --git a/python/samba/samdb.py b/python/samba/samdb.py
index e91cf6516e79a085fb7b0867bd191518b0934afe..0b80c9c878ee1941d5deb68876fd96d2f0b875dc 100644 (file)
--- a/python/samba/samdb.py
+++ b/python/samba/samdb.py
@@ -395,7 +395,8 @@ member: %s
                       "objectClass": "user"}
 
         if smartcard_required:
-            ldbmessage["userAccountControl"] = str(dsdb.UF_NORMAL_ACCOUNT |dsdb.UF_SMARTCARD_REQUIRED)
+            ldbmessage["userAccountControl"] = str(dsdb.UF_NORMAL_ACCOUNT |
+                                                   dsdb.UF_SMARTCARD_REQUIRED)
             setpassword = False
 
         if surname is not None: