Merge pull request #229 from dstansby/globalatts-line-breaks

Fix reading globalatts with multiple entries
MAVENSDC · Jul 28, 2023 · 1763269 · 1763269
2 parents 635c5b5 + 05a4e78
commit 1763269
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/cdflib/cdfread.py b/cdflib/cdfread.py
@@ -511,6 +511,7 @@ def globalattsget(self) -> Dict[str, List[Union[str, np.ndarray]]]:
                         entryData = entryData[0]
 
                 entries.append(entryData)
+                aedr_byte_loc = aedr_info.next_aedr
 
             return_dict[adr_info.name] = entries
             byte_loc = adr_info.next_adr_loc

diff --git a/doc/changelog.rst b/doc/changelog.rst
@@ -7,6 +7,7 @@ Changelog
 - If the `deflate <https://github.com/dcwatson/deflate>`_ library is installed
   it is now used to decompress data, which can lead to around 2x speedups over
   the native gzip Python library.
+- Fixed reading attributes with multiple entries when using `cdflib.cdfread.CDF.globalattsget`.
 
 1.0.5
 =====

diff --git a/tests/test_cdfread.py b/tests/test_cdfread.py
@@ -18,7 +18,11 @@ def test_read(cdf_path):
         cdf.cdf_info()
 
     # Smoke test global attributes
-    cdf.globalattsget()
+    globalatts = cdf.globalattsget()
+    for att in globalatts:
+        if len(globalatts[att]) > 1:
+            # Make sure multiple entries are unique
+            assert len(globalatts[att]) == len(set(globalatts[att]))
 
 
 def test_nonexist_file_errors(tmp_path):