W504 - line break after binary operator

Author: Guillaume Valadon

scapy/arch/bpf/core.py

@@ -70,9 +70,8 @@ def get_if_raw_hwaddr(ifname):
         raise Scapy_Exception("Failed to execute ifconfig: (%s)" % msg)
 
     # Get MAC addresses
-    addresses = [l for l in fd.readlines() if l.find("ether") >= 0 or
-                 l.find("lladdr") >= 0 or
-                 l.find("address") >= 0]
+    addresses = [l for l in fd.readlines()
+                 if "ether" in l or "lladdr" in l or "address" in l]
     if not addresses:
         raise Scapy_Exception("No MAC address found on %s !" % ifname)
 

scapy/arch/windows/__init__.py

@@ -634,11 +634,13 @@ def _check_npcap_requirement(self):
         if not conf.use_npcap:
             raise OSError("This operation requires Npcap.")
         if self.raw80211 is None:
-            # This checks if npcap has Dot11 enabled and if the interface is compatible,  # noqa: E501
-            # by looking for the npcap/Parameters/Dot11Adapters key in the registry.  # noqa: E501
+            # This checks if npcap has Dot11 enabled and if the interface is
+            # compatible, by looking for the npcap/Parameters/Dot11Adapters
+            # key in the registry.
             dot11adapters = _get_npcap_dot11_adapters()
-            self.raw80211 = (dot11adapters is not None and
-                             (("\\Device\\" + self.guid).lower() in dot11adapters.lower()))  # noqa: E501
+            self.raw80211 = dot11adapters is not None
+            tmp_adapter = ("\\Device\\" + self.guid).lower()
+            self.raw80211 &= tmp_adapter in dot11adapters.lower()
         if not self.raw80211:
             raise Scapy_Exception("This interface does not support raw 802.11")
 
@@ -868,10 +870,11 @@ def _ask_user():
                         self.load_from_powershell()
                         return
                 _error_msg = "Could not start the pcap service ! "
-            warning(_error_msg +
-                    "You probably won't be able to send packets. "
-                    "Deactivating unneeded interfaces and restarting Scapy might help. "  # noqa: E501
-                    "Check your winpcap and powershell installation, and access rights.")  # noqa: E501
+            _error_msg += "You probably won't be able to send packets. "
+            _error_msg += "Deactivating unneeded interfaces and restarting "
+            _error_msg += "Scapy might help. Check your winpcap and "
+            _error_msg += "powershell installation, and access rights."
+            warning(_error_msg)
         else:
             # Loading state: remove invalid interfaces
             self.remove_invalid_ifaces()

scapy/asn1/asn1.py

@@ -454,8 +454,8 @@ def __setattr__(self, name, value):
                 _len = 13
                 _format = "%y%m%d%H%M%S"
             _nam = self.tag._asn1_obj.__name__[4:].lower()
-            if (isinstance(value, str) and
-                    len(value) == _len and value[-1] == "Z"):
+            if isinstance(value, str) and \
+               len(value) == _len and value[-1] == "Z":
                 dt = datetime.strptime(value[:-1], _format)
                 pretty_time = dt.strftime("%b %d %H:%M:%S %Y GMT")
             else:

scapy/asn1fields.py

@@ -104,10 +104,10 @@ def i2m(self, pkt, x):
         if x is None:
             return b""
         if isinstance(x, ASN1_Object):
-            if (self.ASN1_tag == ASN1_Class_UNIVERSAL.ANY or
-                x.tag == ASN1_Class_UNIVERSAL.RAW or
-                x.tag == ASN1_Class_UNIVERSAL.ERROR or
-               self.ASN1_tag == x.tag):
+            if self.ASN1_tag == ASN1_Class_UNIVERSAL.ANY or \
+               x.tag == ASN1_Class_UNIVERSAL.RAW or \
+               x.tag == ASN1_Class_UNIVERSAL.ERROR or \
+               self.ASN1_tag == x.tag:
                 s = x.enc(pkt.ASN1_codec)
             else:
                 raise ASN1_Error("Encoding Error: got %r instead of an %r for field [%s]" % (x, self.ASN1_tag, self.name))  # noqa: E501

scapy/automaton.py

@@ -512,9 +512,10 @@ def graph(self, **kargs):
                 if n in self.states:
                     s += '\t"%s" -> "%s" [ color=green ];\n' % (st.atmt_state, n)  # noqa: E501
 
-        for c, k, v in ([("purple", k, v) for k, v in self.conditions.items()] +  # noqa: E501
-                        [("red", k, v) for k, v in self.recv_conditions.items()] +  # noqa: E501
-                        [("orange", k, v) for k, v in self.ioevents.items()]):
+        purple_list = [("purple", k, v) for k, v in self.conditions.items()]
+        red_list = [("red", k, v) for k, v in self.recv_conditions.items()]
+        orange_list = [("orange", k, v) for k, v in self.ioevents.items()]
+        for c, k, v in (purple_list + red_list + orange_list):
             for f in v:
                 for n in f.__code__.co_names + f.__code__.co_consts:
                     if n in self.states:
@@ -842,9 +843,9 @@ def _do_iter(self):
                     self._run_condition(cond, *state_output)
 
                 # If still there and no conditions left, we are stuck!
-                if (len(self.recv_conditions[self.state.state]) == 0 and
-                    len(self.ioevents[self.state.state]) == 0 and
-                        len(self.timeout[self.state.state]) == 1):
+                if len(self.recv_conditions[self.state.state]) == 0 and \
+                   len(self.ioevents[self.state.state]) == 0 and \
+                   len(self.timeout[self.state.state]) == 1:
                     raise self.Stuck("stuck in [%s]" % self.state.state,
                                      state=self.state.state, result=state_output)  # noqa: E501
 

scapy/base_classes.py

@@ -41,12 +41,12 @@ def _get_values(value):
     return value.
 
     """
-    if (isinstance(value, tuple) and (2 <= len(value) <= 3) and
-            all(hasattr(i, "__int__") for i in value)):
+    if isinstance(value, tuple) and (2 <= len(value) <= 3) and \
+       all(hasattr(i, "__int__") for i in value):
         # We use values[1] + 1 as stop value for (x)range to maintain
         # the behavior of using tuples as field `values`
-        return range(*((int(value[0]), int(value[1]) + 1) +
-                       tuple(int(v) for v in value[2:])))
+        tmp_tuples = tuple(int(v) for v in value[2:])
+        return range(*((int(value[0]), int(value[1]) + 1) + tmp_tuples))
     return value
 
 
@@ -63,7 +63,7 @@ def transf(self, element):
 
     def __iter__(self):
         for i in self.values:
-            if (isinstance(i, Gen) and
+            if (isinstance(i, Gen) and  # noqa: W504
                 (self._iterpacket or not isinstance(i, BasePacket))) or (
                     isinstance(i, (range, types.GeneratorType))):
                 for j in i:

scapy/contrib/automotive/gm/gmlan.py

@@ -86,9 +86,10 @@ def determine_len(x):
     def answers(self, other):
         """DEV: true if self is an answer from other"""
         if other.__class__ == self.__class__:
-            return (other.service + 0x40) == self.service or \
-                   (self.service == 0x7f and
-                    (self.requestServiceId == other.service))
+            test_1 = (other.service + 0x40) == self.service
+            test_2 = self.service == 0x7f and \
+                self.requestServiceId == other.service
+            return test_1 or test_2
         return 0
 
     def hashret(self):

scapy/contrib/automotive/someip_sd.py

@@ -308,17 +308,18 @@ class SD(_SDPacketBase):
     def get_flag(self, name):
         name = name.upper()
         if (name in self.FLAGSDEF):
-            return ((self.flags & self.FLAGSDEF[name].mask) >>
-                    self.FLAGSDEF[name].offset)
+            masked_flags = self.flags & self.FLAGSDEF[name].mask
+            return masked_flags >> self.FLAGSDEF[name].offset
         else:
             return None
 
     def set_flag(self, name, value):
         name = name.upper()
         if (name in self.FLAGSDEF):
-            self.flags = (self.flags &
-                          (ctypes.c_ubyte(~self.FLAGSDEF[name].mask).value)) \
-                | ((value & 0x01) << self.FLAGSDEF[name].offset)
+            tmp_value = ctypes.c_ubyte(~self.FLAGSDEF[name].mask).value
+            masked_flags = self.flags & tmp_value
+            shifted_value = (value & 0x01) << self.FLAGSDEF[name].offset
+            self.flags = masked_flags | shifted_value
 
     def set_entryArray(self, entry_list):
         if (isinstance(entry_list, list)):

scapy/contrib/automotive/uds.py

@@ -78,9 +78,10 @@ class UDS(Packet):
     def answers(self, other):
         """DEV: true if self is an answer from other"""
         if other.__class__ == self.__class__:
-            return (other.service + 0x40) == self.service or \
-                   (self.service == 0x7f and
-                    self.requestServiceId == other.service)
+            test_1 = (other.service + 0x40) == self.service
+            test_2 = self.service == 0x7f and \
+                self.requestServiceId == other.service
+            return test_1 or test_2
         return 0
 
     def hashret(self):

scapy/contrib/bgp.py

@@ -2034,7 +2034,7 @@ class BGPPathAttr(Packet):
         ByteEnumField("type_code", 0, path_attributes),
         ConditionalField(
             ShortField("attr_ext_len", None),
-            lambda x: x.type_flags is not None and
+            lambda x: x.type_flags is not None and  # noqa: W504
             has_extended_length(x.type_flags)
         ),
         ConditionalField(