Merge pull request #212 from dstansby/pad-error

Fix pad error

.gitignore

@@ -2,23 +2,26 @@
 *.tmp
 .pytest_cache/
 
+*.DS_Store
+
 *.pyc
 *.egg-info/
 build
 /.project
 /.pydevproject
 *.ipynb
-/*.html
-/testing.py
-**/.coverage
-**/.hypothesis
-**/coverage.xml
-**/codecov.sh
+
 doc/_build
 doc/api
+
 .eggs/*
 dist/*
 .hypothesis/*
+
+/*.html
+coverage.xml
+.coverage
+htmlcov
 *asv/*
 
 cdflib/_version.py

cdflib/cdfread.py

@@ -1305,9 +1305,10 @@ def _read_vdr2(self, byte_loc: int) -> VDR:
             num_dims = len(dim_sizes)
             coff = 124 + toadd + 4 * self._rvariables_num_dims
         # Only set if pad value is in the flags
+        pad: Union[None, str, np.ndarray] = None
         if pad_bool:
             byte_stream = vdr[coff:]
-            pad: Union[str, np.ndarray]
+
             try:
                 pad = self._read_data(byte_stream, data_type, 1, num_elements)
             except Exception:

tests/test_cdfread.py

@@ -4,18 +4,19 @@
 
 from cdflib import CDF
 
-fname = pathlib.Path(__file__) / ".." / "testfiles" / "psp_fld_l2_mag_rtn_1min_20200104_v02.cdf"
 
-
-def test_read():
+@pytest.mark.parametrize("fname", ["psp_fld_l2_mag_rtn_1min_20200104_v02.cdf", "de2_ion2s_rpa_19830213_v01.cdf"])
+def test_read(fname):
+    fname = (pathlib.Path(__file__) / ".." / "testfiles" / fname).resolve()
     cdf = CDF(fname)
 
-    cdf.cdf_info()
-    varatts = cdf.varattsget("psp_fld_l2_mag_RTN_1min")
-    assert isinstance(varatts, dict)
+    info = cdf.cdf_info()
 
+    # Smoke test variable access
+    for var in info.zVariables:
+        cdf.varattsget(var)
+        cdf.varget(var)
 
-def test_context():
     with CDF(fname) as cdf:
         cdf.cdf_info()