Merge pull request #2191 from AndreMiras/feature/linter

AndreMiras · web-flow · commit c70432d6c82d · 2020-05-12T09:16:18.000+02:00
🐛 Fixes flake8 errors post update
diff --git a/pythonforandroid/archs.py b/pythonforandroid/archs.py
@@ -145,9 +145,9 @@ def get_env(self, with_flags_in_cc=True):
             + " ".join(
                 [
                     "-L'"
-                    + l.replace("'", "'\"'\"'")
+                    + link_path.replace("'", "'\"'\"'")
                     + "'"  # no shlex.quote in py2
-                    for l in self.extra_global_link_paths
+                    for link_path in self.extra_global_link_paths
                 ]
             )
             + ' ' + ' '.join(self.common_ldflags).format(
diff --git a/pythonforandroid/graph.py b/pythonforandroid/graph.py
@@ -130,7 +130,7 @@ def find_order(graph):
     '''
     while graph:
         # Find all items without a parent
-        leftmost = [l for l, s in graph.items() if not s]
+        leftmost = [name for name, dep in graph.items() if not dep]
         if not leftmost:
             raise ValueError('Dependency cycle detected! %s' % graph)
         # If there is more than one, sort them for predictable order
diff --git a/pythonforandroid/logger.py b/pythonforandroid/logger.py
@@ -199,9 +199,9 @@ def printtail(out, name, forecolor, tail_n=0,
                           re_filter_in=None, re_filter_out=None):
                 lines = out.splitlines()
                 if re_filter_in is not None:
-                    lines = [l for l in lines if re_filter_in.search(l)]
+                    lines = [line for line in lines if re_filter_in.search(line)]
                 if re_filter_out is not None:
-                    lines = [l for l in lines if not re_filter_out.search(l)]
+                    lines = [line for line in lines if not re_filter_out.search(line)]
                 if tail_n == 0 or len(lines) <= tail_n:
                     info('{}:\n{}\t{}{}'.format(
                         name, forecolor, '\t\n'.join(lines), Out_Fore.RESET))
diff --git a/pythonforandroid/pythonpackage.py b/pythonforandroid/pythonpackage.py
@@ -688,7 +688,7 @@ def get_package_dependencies(package,
             new_reqs = set()
             if verbose:
                 print("get_package_dependencies: resolving dependency "
-                      "to package name: ".format(package_dep))
+                      f"to package name: {package_dep}")
             package = get_package_name(package_dep)
             if package.lower() in packages_processed:
                 continue
diff --git a/pythonforandroid/recipes/android/src/android/_ctypes_library_finder.py b/pythonforandroid/recipes/android/src/android/_ctypes_library_finder.py
@@ -53,7 +53,7 @@ def find_library(name):
         lib_search_dirs.insert(0, lib_dir_2)
 
     # Now scan the lib dirs:
-    for lib_dir in [l for l in lib_search_dirs if os.path.exists(l)]:
+    for lib_dir in [ldir for ldir in lib_search_dirs if os.path.exists(ldir)]:
         filelist = [
             f for f in os.listdir(lib_dir)
             if does_libname_match_filename(name, f)
diff --git a/pythonforandroid/recipes/reportlab/__init__.py b/pythonforandroid/recipes/reportlab/__init__.py
@@ -22,9 +22,9 @@ def prebuild_arch(self, arch):
             font_dir = os.path.join(recipe_dir,
                                     "src", "reportlab", "fonts")
             if os.path.exists(font_dir):
-                for l in os.listdir(font_dir):
-                    if l.lower().startswith('darkgarden'):
-                        os.remove(os.path.join(font_dir, l))
+                for file in os.listdir(font_dir):
+                    if file.lower().startswith('darkgarden'):
+                        os.remove(os.path.join(font_dir, file))
 
             # Apply patches:
             self.apply_patch('patches/fix-setup.patch', arch.arch)
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -216,10 +216,10 @@ def build_dist_from_args(ctx, dist, args):
          .format(join(ctx.dist_dir, ctx.distribution.dist_dir)))
 
 
-def split_argument_list(l):
-    if not len(l):
+def split_argument_list(arg_list):
+    if not len(arg_list):
         return []
-    return re.split(r'[ ,]+', l)
+    return re.split(r'[ ,]+', arg_list)
 
 
 class NoAbbrevParser(argparse.ArgumentParser):
@@ -1144,7 +1144,7 @@ def distributions(self, _args):
 
         if dists:
             print('{Style.BRIGHT}Distributions currently installed are:'
-                  '{Style.RESET_ALL}'.format(Style=Out_Style, Fore=Out_Fore))
+                  '{Style.RESET_ALL}'.format(Style=Out_Style))
             pretty_log_dists(dists, print)
         else:
             print('{Style.BRIGHT}There are no dists currently built.'

Original file line number	Diff line number	Diff line change
`@@ -145,9 +145,9 @@ def get_env(self, with_flags_in_cc=True):`
`145`	`145`	`+ " ".join(`
`146`	`146`	`[`
`147`	`147`	`"-L'"`
`148`		`- + l.replace("'", "'\"'\"'")`
	`148`	`+ + link_path.replace("'", "'\"'\"'")`
`149`	`149`	`+ "'" # no shlex.quote in py2`
`150`		`- for l in self.extra_global_link_paths`
	`150`	`+ for link_path in self.extra_global_link_paths`
`151`	`151`	`]`
`152`	`152`	`)`
`153`	`153`	`+ ' ' + ' '.join(self.common_ldflags).format(`