Little but obvious code improvements

Author: Adam Karpierz

scapy/base_classes.py

@@ -90,10 +90,7 @@ def __init__(self, net):
         self.parsed,self.netmask = self._parse_net(net)
 
     def __str__(self):
-        try:
-            return next(self.__iter__())
-        except StopIteration:
-            return None
+        return next(self.__iter__(), None)
 
     def __iter__(self):
         for d in range(*self.parsed[3]):
@@ -102,10 +99,7 @@ def __iter__(self):
                     for a in range(*self.parsed[0]):
                         yield "%i.%i.%i.%i" % (a,b,c,d)
     def choice(self):
-        ip = []
-        for v in self.parsed:
-            ip.append(str(random.randint(v[0],v[1]-1)))
-        return ".".join(ip) 
+        return ".".join(str(random.randint(v[0], v[1] - 1)) for v in self.parsed)
 
     def __repr__(self):
         return "Net(%r)" % self.repr
@@ -120,10 +114,7 @@ def __contains__(self, other):
             p2 = other.parsed
         else:
             p2,nm2 = self._parse_net(other)
-        for (a1,b1),(a2,b2) in zip(self.parsed,p2):
-            if a1 > a2 or b1 < b2:
-                return False
-        return True
+        return all(a1 <= a2 and b1 >= b2 for (a1, b1), (a2, b2) in zip(self.parsed, p2))
     def __rcontains__(self, other):        
         return self in self.__class__(other)
 
@@ -193,8 +184,7 @@ def __new__(cls, name, bases, dct):
 
             dct["fields_desc"] = final_fld
 
-        if "__slots__" not in dct:
-            dct["__slots__"] = []
+        dct.setdefault("__slots__", [])
         for attr in ["name", "overload_fields"]:
             try:
                 dct["_%s" % attr] = dct.pop(attr)
@@ -242,8 +232,7 @@ def __call__(cls, *args, **kargs):
 
 class Field_metaclass(type):
     def __new__(cls, name, bases, dct):
-        if "__slots__" not in dct:
-            dct["__slots__"] = []
+        dct.setdefault("__slots__", [])
         newcls = super(Field_metaclass, cls).__new__(cls, name, bases, dct)
         return newcls
 

scapy/contrib/icmp_extensions.py

@@ -66,12 +66,8 @@ def guess_payload_class(self, payload):
             return Packet.guess_payload_class(self, payload)
 
         for fval, cls in self.payload_guess:
-            ok = 1
-            for k, v in six.iteritems(fval):
-                if not hasattr(ieo, k) or v != ieo.getfieldval(k):
-                    ok = 0
-                    break
-            if ok:
+            if all(hasattr(ieo, k) and v == ieo.getfieldval(k)
+                   for k, v in six.iteritems(fval)):
                 return cls
         return ICMPExtensionObject
 

scapy/dadict.py

@@ -56,10 +56,7 @@ def _branch(self, br, uniq=0):
     def _my_find(self, *args, **kargs):
         if args and self._name not in args:
             return False
-        for k in kargs:
-            if k not in self or self[k] != kargs[k]:
-                return False
-        return True
+        return all(k in self and self[k] == v for k, v in six.iteritems(kargs))
 
     def update(self, *args, **kwargs):
         for k, v in six.iteritems(dict(*args, **kwargs)):

scapy/fields.py

@@ -834,11 +834,7 @@ def any2i(self, pkt, x):
         else:
             return [self.field.any2i(pkt, e) for e in x]
     def i2repr(self, pkt, x):
-        res = []
-        for v in x:
-            r = self.field.i2repr(pkt, v)
-            res.append(r)
-        return "[%s]" % ", ".join(res)
+        return "[%s]" % ", ".join(self.field.i2repr(pkt, v) for v in x)
     def addfield(self, pkt, s, val):
         val = self.i2m(pkt, val)
         for v in val:

scapy/layers/bluetooth.py

@@ -927,7 +927,7 @@ def flush(self):
 @conf.commands.register
 def srbt(bt_address, pkts, inter=0.1, *args, **kargs):
     """send and receive using a bluetooth socket"""
-    if "port" in kargs.keys():
+    if "port" in kargs:
         s = conf.BTsocket(bt_address=bt_address, port=kargs.pop("port"))
     else:
         s = conf.BTsocket(bt_address=bt_address)

scapy/layers/inet.py

@@ -1522,9 +1522,8 @@ def traceroute_map(*args, **kargs):
     show the different paths on a map.
     params:
      - *args: IPs on which traceroute will be called"""
+    kargs.setdefault("verbose", 0)
     res = []
-    if not "verbose" in kargs:
-        kargs["verbose"] = 0
     for target in args:
         res += traceroute(target, **kargs)[0].res
     return TracerouteResult(res).world_trace()

scapy/layers/tls/handshake_sslv2.py

@@ -257,11 +257,7 @@ def __init__(self, *args, **kargs):
         post_build to an object different from the original one... unless
         we hackishly always set self.explicit to 1.
         """
-        if "decryptedkey" in kargs:
-            self.decryptedkey = kargs["decryptedkey"]
-            del kargs["decryptedkey"]
-        else:
-            self.decryptedkey = b""
+        self.decryptedkey = kargs.pop("decryptedkey", b"")
         super(SSLv2ClientMasterKey, self).__init__(*args, **kargs)
         self.explicit = 1
 

scapy/layers/tls/keyexchange.py

@@ -824,8 +824,7 @@ class _UnEncryptedPreMasterSecret(Raw):
     """
     name = "RSA Encrypted PreMaster Secret (protected)"
     def __init__(self, *args, **kargs):
-        if 'tls_session' in kargs:
-            del(kargs['tls_session'])
+        kargs.pop('tls_session', None)
         return super(_UnEncryptedPreMasterSecret, self).__init__(*args, **kargs)
 
 class EncryptedPreMasterSecret(_GenericTLSSessionInheritance):

scapy/packet.py

@@ -554,14 +554,9 @@ def canvas_dump(self, layer_shift=0, rebuild=1):
         forecolor=colgen(0.2, 0.5, 0.8, trans=pyx.color.rgb)
 #        backcolor=makecol(0.376, 0.729, 0.525, 1.0)
 
-        
         def hexstr(x):
-            s = []
-            for c in x:
-                s.append("%02x" % orb(c))
-            return " ".join(s)
+            return " ".join("%02x" % orb(c) for c in x)
 
-                
         def make_dump_txt(x,y,txt):
             return pyx.text.text(XDSTART+x*XMUL, (YDUMP-y)*YMUL, r"\tt{%s}"%hexstr(txt), [pyx.text.size.Large])
 
@@ -758,12 +753,8 @@ def guess_payload_class(self, payload):
         """
         for t in self.aliastypes:
             for fval, cls in t.payload_guess:
-                ok = 1
-                for k, v in six.iteritems(fval):
-                    if not hasattr(self, k) or v != self.getfieldval(k):
-                        ok = 0
-                        break
-                if ok:
+                if all(hasattr(self, k) and v == self.getfieldval(k)
+                       for k, v in six.iteritems(fval)):
                     return cls
         return self.default_payload_class(payload)
 
@@ -1394,22 +1385,16 @@ def split_bottom_up(lower, upper, __fval=None, **fval):
         fval.update(__fval)
     def do_filter(xxx_todo_changeme,upper=upper,fval=fval):
         (f,u) = xxx_todo_changeme
-        if u != upper:
-            return True
-        for k in fval:
-            if k not in f or f[k] != fval[k]:
-                return True
-        return False
+        return u != upper or any(k not in f or f[k] != v for k, v in six.iteritems(fval))
     lower.payload_guess = [x for x in lower.payload_guess if do_filter(x)]
 
 def split_top_down(lower, upper, __fval=None, **fval):
     if __fval is not None:
         fval.update(__fval)
     if lower in upper._overload_fields:
         ofval = upper._overload_fields[lower]
-        for k in fval:
-            if k not in ofval or ofval[k] != fval[k]:
-                return
+        if any(k not in ofval or ofval[k] != v for k, v in six.iteritems(fval)):
+            return
         upper._overload_fields = upper._overload_fields.copy()
         del(upper._overload_fields[lower])