PEP8: improve formatting around bit-wise OR ("|")

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

2 files changed, 27 insertions, 23 deletions

diff --git a/python/samba/tests/dcerpc/raw_testcase.py b/python/samba/tests/dcerpc/raw_testcase.py
index 589f337e8d1..1ab22f3c2e8 100644
--- a/python/samba/tests/dcerpc/raw_testcase.py
+++ b/python/samba/tests/dcerpc/raw_testcase.py
@@ -293,8 +293,9 @@ class RawDCERPCTest(TestCase):
                           allow_remaining=False,
                           send_req=True,
                           recv_rep=True,
-                          fault_pfc_flags=samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
-                          samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST,
+                          fault_pfc_flags=(
+                              samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
+                              samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST),
                           fault_status=None,
                           fault_context_id=None,
                           timeout=None,
@@ -638,8 +639,8 @@ class RawDCERPCTest(TestCase):
     def generate_pdu(self, ptype, call_id, payload,
                      rpc_vers=5,
                      rpc_vers_minor=0,
-                     pfc_flags=samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
-                     samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST,
+                     pfc_flags=(samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
+                                samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST),
                      drep=[samba.dcerpc.dcerpc.DCERPC_DREP_LE, 0, 0, 0],
                      ndr_print=None, hexdump=None):
 
@@ -670,8 +671,8 @@ class RawDCERPCTest(TestCase):
     def verify_pdu(self, p, ptype, call_id,
                    rpc_vers=5,
                    rpc_vers_minor=0,
-                   pfc_flags=samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
-                   samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST,
+                   pfc_flags=(samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
+                              samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST),
                    drep=[samba.dcerpc.dcerpc.DCERPC_DREP_LE, 0, 0, 0],
                    auth_length=None):
 
@@ -701,8 +702,8 @@ class RawDCERPCTest(TestCase):
         return
 
     def generate_bind(self, call_id,
-                      pfc_flags=samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
-                      samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST,
+                      pfc_flags=(samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
+                                 samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST),
                       max_xmit_frag=5840,
                       max_recv_frag=5840,
                       assoc_group_id=0,
@@ -727,8 +728,8 @@ class RawDCERPCTest(TestCase):
         return p
 
     def generate_alter(self, call_id,
-                       pfc_flags=samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
-                       samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST,
+                       pfc_flags=(samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
+                                  samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST),
                        max_xmit_frag=5840,
                        max_recv_frag=5840,
                        assoc_group_id=0,
@@ -753,8 +754,8 @@ class RawDCERPCTest(TestCase):
         return p
 
     def generate_auth3(self, call_id,
-                       pfc_flags=samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
-                       samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST,
+                       pfc_flags=(samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
+                                  samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST),
                        auth_info="",
                        ndr_print=None, hexdump=None):
 
@@ -770,8 +771,8 @@ class RawDCERPCTest(TestCase):
         return p
 
     def generate_request(self, call_id,
-                         pfc_flags=samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
-                         samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST,
+                         pfc_flags=(samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
+                                    samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST),
                          alloc_hint=None,
                          context_id=None,
                          opnum=None,
@@ -803,8 +804,8 @@ class RawDCERPCTest(TestCase):
         return p
 
     def generate_co_cancel(self, call_id,
-                           pfc_flags=samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
-                           samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST,
+                           pfc_flags=(samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
+                                      samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST),
                            auth_info="",
                            ndr_print=None, hexdump=None):
 
@@ -820,8 +821,8 @@ class RawDCERPCTest(TestCase):
         return p
 
     def generate_orphaned(self, call_id,
-                          pfc_flags=samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
-                          samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST,
+                          pfc_flags=(samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
+                                     samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST),
                           auth_info="",
                           ndr_print=None, hexdump=None):
 
@@ -837,8 +838,8 @@ class RawDCERPCTest(TestCase):
         return p
 
     def generate_shutdown(self, call_id,
-                          pfc_flags=samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
-                          samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST,
+                          pfc_flags=(samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_FIRST |
+                                     samba.dcerpc.dcerpc.DCERPC_PFC_FLAG_LAST),
                           ndr_print=None, hexdump=None):
 
         s = samba.dcerpc.dcerpc.shutdown()
diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py
index 7207835b95c..12555b7994e 100644
--- a/python/samba/upgrade.py
+++ b/python/samba/upgrade.py
@@ -570,7 +570,10 @@ def upgrade_from_samba3(samba3, logger, targetdir, session_info=None,
             next_rid = entry['rid'] + 1
 
         user = s3db.getsampwnam(username)
-        acct_type = (user.acct_ctrl & (samr.ACB_NORMAL |samr.ACB_WSTRUST |samr.ACB_SVRTRUST |samr.ACB_DOMTRUST))
+        acct_type = (user.acct_ctrl & (samr.ACB_NORMAL |
+                                       samr.ACB_WSTRUST |
+                                       samr.ACB_SVRTRUST |
+                                       samr.ACB_DOMTRUST))
         if acct_type == samr.ACB_SVRTRUST:
             logger.warn("  Demoting BDC account trust for %s, this DC must be elevated to an AD DC using 'samba-tool domain dcpromo'" % username[:-1])
             user.acct_ctrl = (user.acct_ctrl & ~samr.ACB_SVRTRUST) | samr.ACB_WSTRUST
@@ -583,11 +586,11 @@ def upgrade_from_samba3(samba3, logger, targetdir, session_info=None,
             logger.warn("  Skipping account %s that has ACB_WSTRUST (W) set but does not end in $.  This account can not have worked, and is probably left over from a misconfiguration." % username)
             continue
 
-        elif acct_type == (samr.ACB_NORMAL |samr.ACB_WSTRUST) and username[-1] == '$':
+        elif acct_type == (samr.ACB_NORMAL | samr.ACB_WSTRUST) and username[-1] == '$':
             logger.warn("  Fixing account %s which had both ACB_NORMAL (U) and ACB_WSTRUST (W) set.  Account will be marked as ACB_WSTRUST (W), i.e. as a domain member" % username)
             user.acct_ctrl = (user.acct_ctrl & ~samr.ACB_NORMAL)
 
-        elif acct_type == (samr.ACB_NORMAL |samr.ACB_SVRTRUST) and username[-1] == '$':
+        elif acct_type == (samr.ACB_NORMAL | samr.ACB_SVRTRUST) and username[-1] == '$':
             logger.warn("  Fixing account %s which had both ACB_NORMAL (U) and ACB_SVRTRUST (S) set.  Account will be marked as ACB_WSTRUST (S), i.e. as a domain member" % username)
             user.acct_ctrl = (user.acct_ctrl & ~samr.ACB_NORMAL)