minor cosmetic fixes

Author: patkyn

Diff for: .flake8

@@ -1,6 +1,6 @@
 [flake8]
 max-line-length = 120
-max-complexity = 19
+max-complexity = 20
 select = C,E,F,W,B,B950
 ignore = E126,E203,E501,W503,W504
 exclude =

Diff for: src/dwcahandler/dwca/core_dwca.py

@@ -188,10 +188,10 @@ def convert_values(v):
             files = zf.namelist()
 
             log.info("Reading from %s", self.dwca_file_loc)
-            #with zf.open(self.defaults_prop.meta_xml_filename) as meta_xml_file:
+
             with io.TextIOWrapper(zf.open(self.defaults_prop.meta_xml_filename)) as meta_xml:
-                    self.meta_content.read_meta_file(meta_xml)
-                    meta_xml.close()
+                self.meta_content.read_meta_file(meta_xml)
+                meta_xml.close()
 
             if self.meta_content.eml_xml_filename in files:
                 with io.TextIOWrapper(zf.open(self.meta_content.eml_xml_filename),

Diff for: tests/__init__.py

@@ -25,18 +25,18 @@ def make_fields(columns: list, term_uri: str):
     return fields
 
 
-def make_ext_str(ext_columns:list, term_uri: str):
+def make_ext_str(ext_columns: list, term_uri: str):
     ext_meta_str = ''
     fields = make_fields(ext_columns, term_uri)
     if fields:
-        ext_meta_str = f'''  
+        ext_meta_str = f'''
 <extension encoding="UTF-8" rowType="http://rs.gbif.org/terms/1.0/Multimedia" fieldsTerminatedBy="," linesTerminatedBy="\\r\\n" fieldsEnclosedBy="&quot;" ignoreHeaderLines="1">
     <files>
       <location>multimedia.csv</location>
     </files>
     <coreid index="0"/>
     {fields}
-  </extension>        
+  </extension>
 '''
     return ext_meta_str
 

Diff for: tests/test_delete_dwca_content.py

@@ -99,4 +99,3 @@ def test_delete_records_dwca_ext(self):
                 pd.testing.assert_frame_equal(multimedia_df_output.drop(columns="coreid"), expected_mult_df)
 
             zf.close()
-

Diff for: tests/test_merge_dwca.py

@@ -74,8 +74,8 @@ def test_merge_core_and_ext_records(self):
                               columns=['occurrenceID', 'scientificName', 'decimalLatitude', 'decimalLongitude'])
 
         multimedia_df = pd.DataFrame(data=[["1", "https://image1.jpg", "image/jpeg", "StillImage"],
-                                   ["2", "https://image2.jpg", "image/jpeg", "StillImage"],
-                                   ["3", "https://image3.jpg", "image/jpeg", "StillImage"]],
+                                           ["2", "https://image2.jpg", "image/jpeg", "StillImage"],
+                                           ["3", "https://image3.jpg", "image/jpeg", "StillImage"]],
                                      columns=["occurrenceID", "identifier", "format", "type"])
 
         dwca_ext_obj = make_dwca(occ_df, multimedia_df)