Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/siphon/simplewebservice/igra2.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import datetime
from io import BytesIO, StringIO
import itertools
import sys
import warnings
from zipfile import ZipFile

Expand Down Expand Up @@ -201,7 +200,7 @@ def _cflag(val):
def _ctime(strformat='MMMSS'):
"""Return a function converting a string from MMMSS or HHMM to seconds."""
def _ctime_strformat(val):
time = val.strip().zfill(5)
time = val.strip().zfill(len(strformat))

if int(time) < 0 or int(time) == 9999:
return np.nan
Expand All @@ -215,7 +214,7 @@ def _ctime_strformat(val):
minutes = int(time[2:4])
time_seconds = hours * 3600 + minutes * 60
else:
sys.exit('Unrecognized time format')
raise ValueError(f'Unrecognized time format "{strformat}"')

return time_seconds
return _ctime_strformat
Expand Down
7 changes: 7 additions & 0 deletions tests/test_igra2.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ def subsetter(response):
return subsetter


def test_release_time_converter_uses_hhmm_width():
"""Test that release times preserve both hour digits when converted."""
converter = IGRAUpperAir()._get_fwf_params()['header']['converters']['release_time']

assert converter('1142') == 11 * 3600 + 42 * 60


@recorder.use_cassette('igra2_sounding',
before_record_response=subset_date(datetime(2010, 6, 1)))
def test_igra2():
Expand Down