Merge pull request #154 from dopplershift/printing

Printing/repr improvements

siphon/catalog.py

@@ -129,6 +129,10 @@ def filter_time_range(self, start, end, regex=None):
         return [item[-1] for item in self._get_datasets_with_times(regex)
                 if start <= item[0] <= end]
 
+    def __str__(self):
+        """Return a string representation of the collection."""
+        return str(list(self))
+
 
 class TDSCatalog(object):
     """

siphon/cdmr/dataset.py

@@ -122,6 +122,8 @@ def __str__(self):
                 print_groups.append('\t{}: {}'.format(att, getattr(self, att)))
         return '\n'.join(print_groups)
 
+    __repr__ = __str__
+
 
 class Dataset(Group):
     """Abstract away access to the remote dataset."""
@@ -144,6 +146,8 @@ def __str__(self):
         """Return a string representation of the Dataset and all contained members."""
         return self.url + '\n' + super(Dataset, self).__str__()
 
+    __repr__ = __str__
+
 
 class Variable(AttributeContainer):
     """Hold information about a data variable and provide access to the underlying data."""
@@ -372,3 +376,5 @@ def __str__(self):
             grps.append(', size = {0}'.format(self.size))
 
         return ''.join(grps)
+
+    __repr__ = __str__

siphon/cdmr/tests/test_dataset.py

@@ -5,6 +5,7 @@
 
 import numpy as np
 from numpy.testing import assert_almost_equal, assert_array_almost_equal, assert_array_equal
+import pytest
 
 from siphon.cdmr import Dataset
 from siphon.testing import get_recorder
@@ -318,10 +319,11 @@ def test_unsigned_var():
 
 
 @recorder.use_cassette('nc4_groups')
-def test_print():
-    """Test that __str__ (or printing) a dataset works."""
+@pytest.mark.parametrize('func', [str, repr])
+def test_print(func):
+    """Test that str and repr of a dataset work."""
     ds = Dataset('http://localhost:8080/thredds/cdmremote/nc4/tst/tst_groups.nc')
-    s = str(ds)
+    s = func(ds)
     truth = """http://localhost:8080/thredds/cdmremote/nc4/tst/tst_groups.nc
 Groups:
 g1

siphon/tests/test_catalog.py

@@ -139,6 +139,17 @@ def test_datasets_get_by_index():
     assert cat.datasets[2].name == 'Latest Collection for NAM CONUS 20km'
 
 
+@recorder.use_cassette('top_level_20km_rap_catalog')
+def test_datasets_str():
+    """Test that datasets are printed as expected."""
+    url = ('http://thredds.ucar.edu/thredds/catalog/grib/NCEP/NAM/'
+           'CONUS_20km/noaaport/catalog.xml')
+    cat = TDSCatalog(url)
+    assert str(cat.datasets) == ("['Full Collection (Reference / Forecast Time) Dataset', "
+                                 "'Best NAM CONUS 20km Time Series', "
+                                 "'Latest Collection for NAM CONUS 20km']")
+
+
 @recorder.use_cassette('top_level_20km_rap_catalog')
 def test_datasets_nearest_time():
     """Test getting dataset by time using filenames."""

siphon/tests/test_ncss.py

@@ -184,7 +184,7 @@ def test_vertical_level(self):
         self.nq.accept('csv').vertical_level(50000)
         csv_data = self.ncss.get_data(self.nq)
 
-        assert str(csv_data['Temperature_isobaric'])[:6] == '263.39'
+        np.testing.assert_almost_equal(csv_data['Temperature_isobaric'], np.array([263.40]), 2)
 
     @recorder.use_cassette('ncss_gfs_csv_point')
     def test_raw_csv(self):