flake8

Author: znicholls

src/netcdf_scm/cli.py

@@ -319,6 +319,9 @@ def wrangle_openscm_csvs(src, dst, var_to_wrangle, nested, out_format):
             if not var_regexp.match(dirpath):
                 continue
 
+            format_custom_text.update_mapping(curr_dir=dirpath)
+            bar.update(i)
+
             openscmdf = df_append([join(dirpath, f) for f in filenames])
 
             if nested:
@@ -342,6 +345,6 @@ def wrangle_openscm_csvs(src, dst, var_to_wrangle, nested, out_format):
         if out_format == "tuningstrucs":
             out_file = join(dst, "ts")
             click.echo("Wrangling everything to {}".format(dst))
-            convert_scmdf_to_tuningstruc(openscmdf, out_file)
+            convert_scmdf_to_tuningstruc(collected, out_file)
         else:
             raise ValueError("Unsupported format: {}".format(out_format))

src/netcdf_scm/mat4py/loadmat.py

@@ -26,8 +26,13 @@
 
 
 # encode a string to bytes and vice versa
-asbytes = lambda s: s.encode("latin1")
-asstr = lambda b: b.decode("latin1")
+def asbytes(s):
+    return s.encode("latin1")
+
+
+def asstr(b):
+    return b.decode("latin1")
+
 
 # array element data types
 etypes = {
@@ -323,7 +328,9 @@ def read_struct_array(fd, endian, header):
         fields = [fields]
 
     # read rows and columns of each field
-    empty = lambda: [list() for i in range(header["dims"][0])]
+    def empty():
+        return [list() for i in range(header["dims"][0])]
+
     array = {}
     for row in range(header["dims"][0]):
         for col in range(header["dims"][1]):

src/netcdf_scm/mat4py/savemat.py

@@ -27,8 +27,13 @@
 
 
 # encode a string to bytes and vice versa
-asbytes = lambda s: s.encode("latin1")
-asstr = lambda b: b.decode("latin1")
+def asbytes(s):
+    return s.encode("latin1")
+
+
+def asstr(b):
+    return b.decode("latin1")
+
 
 # array element data types
 etypes = {
@@ -145,13 +150,13 @@ def write_elements(fd, mtp, data, is_name=False):
             else:
                 fmt = "".join("{}s".format(len(s)) for s in data)
         else:
-            l = len(data)
-            if l == 0:
+            length = len(data)
+            if length == 0:
                 # empty array
                 fmt = ""
-            if l > 1:
+            if length > 1:
                 # more than one element to be written
-                fmt = "{}{}".format(l, fmt)
+                fmt = "{}{}".format(length, fmt)
     else:
         data = (data,)
     num_bytes = struct.calcsize(fmt)

src/netcdf_scm/wranglers.py

@@ -68,7 +68,7 @@ def convert_tuningstruc_to_scmdf(
                 try:
                     metadata[k] = [dataset["tuningdata"]["model"][m][k]]
                 except KeyError:
-                    if k is "model":
+                    if k == "model":
                         metadata[k] = ["unspecified"]
                         continue