Another "Generator Expressions" improvements

wifite/attack/all.py

@@ -54,7 +54,7 @@ def attack_single(cls, target, targets_remaining):
             # WPA can have multiple attack vectors:
 
             # WPS
-            if target.wps != False:
+            if target.wps:
                 if Configuration.wps_pixie:
                     attacks.append(AttackWPS(target, pixie_dust=True))
                 if Configuration.wps_pin:

wifite/attack/pmkid.py

@@ -63,7 +63,7 @@ def run(self):
             True if handshake is captured. False otherwise.
         '''
         # Skip if user only wants to attack WPS targets
-        if Configuration.wps_only and self.target.wps == False:
+        if Configuration.wps_only and not self.target.wps:
             Color.pl('\r{!} {O}Skipping PMKID attack on {R}%s{O} because {R}--wps-only{O} is set{W}' % self.target.essid)
             self.success = False
             return False
@@ -82,7 +82,7 @@ def run(self):
 
         pmkid_file = None
 
-        if Configuration.ignore_old_handshakes == False:
+        if not Configuration.ignore_old_handshakes:
             # Load exisitng PMKID hash from filesystem
             pmkid_file = self.get_existing_pmkid_file(self.target.bssid)
             if pmkid_file is not None:

wifite/attack/wpa.py

@@ -28,7 +28,7 @@ def run(self):
         '''Initiates full WPA handshake capture attack.'''
 
         # Skip if target is not WPS
-        if Configuration.wps_only and self.target.wps == False:
+        if Configuration.wps_only and not self.target.wps:
             Color.pl('\r{!} {O}Skipping WPA-Handshake attack on {R}%s{O} because {R}--wps-only{O} is set{W}' % self.target.essid)
             self.success = False
             return self.success
@@ -96,7 +96,7 @@ def capture_handshake(self):
             self.clients = []
 
             # Try to load existing handshake
-            if Configuration.ignore_old_handshakes == False:
+            if not Configuration.ignore_old_handshakes:
                 bssid = airodump_target.bssid
                 essid = airodump_target.essid if airodump_target.essid_known else None
                 handshake = self.load_handshake(bssid=bssid, essid=essid)

wifite/config.py

@@ -180,15 +180,15 @@ def parse_settings_args(cls, args):
             Color.pl('{+} {C}option:{W} targeting BSSID ' +
                     '{G}%s{W}' % args.target_bssid)
 
-        if args.five_ghz == True:
+        if args.five_ghz:
             cls.five_ghz = True
             Color.pl('{+} {C}option:{W} including {G}5Ghz networks{W} in scans')
 
-        if args.show_bssids == True:
+        if args.show_bssidS:
             cls.show_bssids = True
             Color.pl('{+} {C}option:{W} showing {G}bssids{W} of targets during scan')
 
-        if args.no_deauth == True:
+        if args.no_deauth:
             cls.no_deauth = True
             Color.pl('{+} {C}option:{W} will {R}not{W} {O}deauth{W} clients ' +
                     'during scans or captures')
@@ -207,7 +207,7 @@ def parse_settings_args(cls, args):
             Color.pl('{+} {C}option:{W} {O}ignoring ESSIDs that include {R}%s{W}' % (
                 args.ignore_essid))
 
-        if args.clients_only == True:
+        if args.clients_only:
             cls.clients_only = True
             Color.pl('{+} {C}option:{W} {O}ignoring targets that do not have ' +
                 'associated clients')

wifite/model/result.py

@@ -84,7 +84,7 @@ def display(cls):
             len(cracked_targets), name))
 
         results = sorted([cls.load(item) for item in cracked_targets], key=lambda x: x.date, reverse=True)
-        longest_essid = max([len(result.essid or 'ESSID') for result in results])
+        longest_essid = max(len(result.essid or 'ESSID') for result in results)
 
         # Header
         Color.p('{D} ')

wifite/model/target.py

@@ -134,9 +134,9 @@ def to_str(self, show_bssid=False):
         power = Color.s('{%s}%s' % (color, power))
 
         wps = Color.s('{O} n/a')
-        if self.wps == True:
+        if self.wps:
             wps = Color.s('{G} yes')
-        elif self.wps == False:
+        elif not self.wps:
             wps = Color.s('{O}  no')
         elif self.wps is None:
             wps = Color.s('{R}lock')

wifite/tools/airmon.py

@@ -344,10 +344,8 @@ def terminate_conflicting_processes():
 
         if not Configuration.kill_conflicting_processes:
             # Don't kill processes, warn user
-            names_and_pids = ', '.join([
-                '{R}%s{O} (PID {R}%s{O})' % (pname, pid)
-                for pid, pname in pid_pnames
-            ])
+            names_and_pids = ', '.join('{R}%s{O} (PID {R}%s{O})' % (pname, pid)
+                for pid, pname in pid_pnames)
             Color.pl('{!} {O}Conflicting processes: %s' % names_and_pids)
             Color.pl('{!} {O}If you have problems: {R}kill -9 PID{O} or re-run wifite with {R}--kill{O}){W}')
             return

wifite/tools/airodump.py

@@ -260,7 +260,7 @@ def filter_targets(targets, skip_wps=False):
                 result.append(target)
             elif 'WPA' in Configuration.encryption_filter and 'WPA' in target.encryption:
                     result.append(target)
-            elif 'WPS' in Configuration.encryption_filter and target.wps != False:
+            elif 'WPS' in Configuration.encryption_filter and target.wps:
                 result.append(target)
             elif skip_wps:
                 result.append(target)

wifite/tools/dependency.py

@@ -47,7 +47,7 @@ def run_dependency_check(cls):
                 Macchanger
             ]
 
-        missing_required = any([app.fails_dependency_check() for app in apps])
+        missing_required = any(app.fails_dependency_check() for app in apps)
 
         if missing_required:
             Color.pl('{!} {O}At least 1 Required app is missing. Wifite needs Required apps to run{W}')

wifite/tools/wash.py

@@ -45,7 +45,7 @@ def check_for_wps_and_update_targets(capfile, targets):
                 obj = json.loads(line)
                 bssid = obj['bssid']
                 locked = obj['wps_locked']
-                if locked != True:
+                if not locked:
                     wps_bssids.add(bssid)
                 else:
                     locked_bssids.add(bssid)

wifite/util/crack.py

@@ -53,7 +53,7 @@ def run(cls):
             return
 
         hs_to_crack = cls.get_user_selection(handshakes)
-        any_pmkid = any([hs['type'] == 'PMKID' for hs in hs_to_crack])
+        any_pmkid = any(hs['type'] == 'PMKID' for hs in hs_to_crack)
 
         # Tools for cracking & their dependencies.
         available_tools = {
@@ -76,7 +76,7 @@ def run(cls):
         if len(missing_tools) > 0:
             Color.pl('\n{!} {O}Unavailable tools (install to enable):{W}')
             for tool, deps in missing_tools:
-                dep_list = ', '.join([dep.dependency_name for dep in deps])
+                dep_list = ', '.join(dep.dependency_name for dep in deps)
                 Color.pl('     {R}* {R}%s {W}({O}%s{W})' % (tool, dep_list))
 
         Color.p('\n{+} Enter the {C}cracking tool{W} to use ({C}%s{W}): {G}' % (

wifite/util/scanner.py

@@ -88,7 +88,7 @@ def found_target(self):
             return False  # No specific target from user.
 
         for target in self.targets:
-            if Configuration.wps_only and target.wps == False:
+            if Configuration.wps_only and not target.wps:
                 continue
             if bssid and target.bssid and bssid.lower() == target.bssid.lower():
                 self.target = target