Merge branch 'DFO_issues' of https://github.com/upsonp/python-ctd into DFO_issues

upsonp · upsonp · commit ea0385632d1e · 2022-05-31T14:22:36.000-03:00
diff --git a/ctd/read.py b/ctd/read.py
@@ -181,7 +181,7 @@ def _parse_seabird(lines, ftype):
         names.append("Statistic")
     metadata.update(
         {
-            "name": fname if fname else "default_file",
+            "name": fname if fname else "unknown",
             "header": "\n".join(header),
             "config": "\n".join(config),
             "names": _remane_duplicate_columns(names),
diff --git a/tests/test_read.py b/tests/test_read.py
@@ -86,9 +86,7 @@ def test_btl_is_dataframe(btl):
 
 
 def test_btl_with_dup_cols(btl_as_stream):
-    assert all(
-        col in btl_as_stream.columns for col in ["Bottle", "Bottle_"]
-    )
+    assert all(col in btl_as_stream.columns for col in ["Bottle", "Bottle_"])
 
 
 def test_btl_as_stringio(btl_as_stream):

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ def _parse_seabird(lines, ftype):`
`181`	`181`	`names.append("Statistic")`
`182`	`182`	`metadata.update(`
`183`	`183`	`{`
`184`		`- "name": fname if fname else "default_file",`
	`184`	`+ "name": fname if fname else "unknown",`
`185`	`185`	`"header": "\n".join(header),`
`186`	`186`	`"config": "\n".join(config),`
`187`	`187`	`"names": _remane_duplicate_columns(names),`