diff --git a/geomagio/iaga2002/IAGA2002Parser.py b/geomagio/iaga2002/IAGA2002Parser.py index 25906e21fb529be6fa716f8068d1e2b2fcb0c06f..6bbc11eddd02f76c53863cc1c6f081eb98f32a4a 100644 --- a/geomagio/iaga2002/IAGA2002Parser.py +++ b/geomagio/iaga2002/IAGA2002Parser.py @@ -186,7 +186,7 @@ class IAGA2002Parser(object): conditions_of_use = comment.replace( 'CONDITIONS OF USE:', '').strip() else: - comment_upper = comment.upper(); + comment_upper = comment.upper() if 'FILTER' in comment_upper: filter_comments.append(comment) elif 'INTERMAGNET DVD' in comment_upper or \ diff --git a/geomagio/iaga2002/IAGA2002Parser_test.py b/geomagio/iaga2002/IAGA2002Parser_test.py index 1a702b82de827d60c3341aceadc0a62d4625b99d..841994280d3d32e18c760efe7c33d8929a41af3b 100644 --- a/geomagio/iaga2002/IAGA2002Parser_test.py +++ b/geomagio/iaga2002/IAGA2002Parser_test.py @@ -105,5 +105,4 @@ def test_parse_decbas(): """ parser = IAGA2002Parser() parser.parse(IAGA2002_EXAMPLE) - print parser.stats - assert_equals(parser.stats['declination_base'], '5527') + assert_equals(parser.metadata['declination_base'], 5527) diff --git a/geomagio/iaga2002/IAGA2002Writer.py b/geomagio/iaga2002/IAGA2002Writer.py index 02f844ceaffe7f39f009484f0f675785b7559617..b1282d73bf8e8dab8c9265415d840e738d1e2feb 100644 --- a/geomagio/iaga2002/IAGA2002Writer.py +++ b/geomagio/iaga2002/IAGA2002Writer.py @@ -47,8 +47,8 @@ class IAGA2002Writer(object): # build comments comments = [] if 'declination_base' in stats: - comments.append('DECBAS {:<8d}' \ - '(Baseline declination value in tenths of minutes East' \ + comments.append('DECBAS {:<8d}' + '(Baseline declination value in tenths of minutes East' ' (0-216,000)).'.format(stats.declination_base)) if 'filter_comments' in stats: comments.extend(stats.filter_comments) @@ -60,7 +60,7 @@ class IAGA2002Writer(object): comments.append('Go to www.intermagnet.org for details on' + ' obtaining this product.') if 'conditions_of_use' in stats: - comments.append('CONDITIONS OF USE: ' + stats.conditions_of_use); + comments.append('CONDITIONS OF USE: ' + stats.conditions_of_use) # generate comment output buf = [] for comment in comments: