diff --git a/awips/RadarCommon.py b/awips/RadarCommon.py index 23e227d..f09b362 100644 --- a/awips/RadarCommon.py +++ b/awips/RadarCommon.py @@ -57,14 +57,14 @@ def get_hdf5_data(idra): threshVals = [] if len(idra) > 0: for ii in range(len(idra)): - if idra[ii].getName() == b"Data": + if idra[ii].getName() == "Data": rdat = idra[ii] - elif idra[ii].getName() == b"Angles": + elif idra[ii].getName() == "Angles": azdat = idra[ii] dattyp = "radial" - elif idra[ii].getName() == b"DependentValues": + elif idra[ii].getName() == "DependentValues": depVals = idra[ii].getShortData() - elif idra[ii].getName() == b"Thresholds": + elif idra[ii].getName() == "Thresholds": threshVals = idra[ii].getShortData() return rdat,azdat,depVals,threshVals diff --git a/awips/test/dafTests/baseBufrMosTestCase.py b/awips/test/dafTests/baseBufrMosTestCase.py index 8004511..e1e990d 100644 --- a/awips/test/dafTests/baseBufrMosTestCase.py +++ b/awips/test/dafTests/baseBufrMosTestCase.py @@ -23,7 +23,7 @@ import unittest class BufrMosTestCase(baseDafTestCase.DafTestCase): """Base class for testing DAF support of bufrmos data""" - data_params = b"temperature", b"dewpoint" + data_params = "temperature", "dewpoint" def testGetAvailableParameters(self): req = DAL.newDataRequest(self.datatype) diff --git a/awips/test/dafTests/testBufrMosHpc.py b/awips/test/dafTests/testBufrMosHpc.py index e479e40..045ac8a 100644 --- a/awips/test/dafTests/testBufrMosHpc.py +++ b/awips/test/dafTests/testBufrMosHpc.py @@ -24,6 +24,6 @@ class BufrMosHpcTestCase(baseBufrMosTestCase.BufrMosTestCase): """Test DAF support for bufrmosHPC data""" datatype = "bufrmosHPC" - data_params = b"forecastHr", b"maxTemp24Hour" + data_params = "forecastHr", "maxTemp24Hour" # All tests inherited from superclass diff --git a/awips/test/dafTests/testBufrMosMrf.py b/awips/test/dafTests/testBufrMosMrf.py index 2dbe9bc..13bf1b7 100644 --- a/awips/test/dafTests/testBufrMosMrf.py +++ b/awips/test/dafTests/testBufrMosMrf.py @@ -24,6 +24,6 @@ class BufrMosMrfTestCase(baseBufrMosTestCase.BufrMosTestCase): """Test DAF support for bufrmosMRF data""" datatype = "bufrmosMRF" - data_params = b"forecastHr", b"maxTempDay" + data_params = "forecastHr", "maxTempDay" # All tests inherited from superclass