Skip to content

Improve warning and error messages for old routine. #3452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2019
Merged

Improve warning and error messages for old routine. #3452

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions lib/iris/analysis/calculus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,16 @@ def _construct_midpoint_coord(coord, circular=None):

"""
if circular and not hasattr(coord, 'circular'):
raise ValueError('Cannot produce circular midpoint from a coord '
'without the circular attribute')
msg = ("Cannot produce a circular midpoint for the '{}' coord, "
"which does not have a 'circular' attribute.")
raise ValueError(msg.format(coord.name()))

if circular is None:
circular = getattr(coord, 'circular', False)
elif circular != getattr(coord, 'circular', False):
warnings.warn('circular flag and Coord.circular attribute do '
'not match')
msg = ("Construction coordinate midpoints for the '{}' coordinate, "
"though it has the attribute 'circular'={}.")
warnings.warn(msg.format(circular, coord.circular, coord.name()))

if coord.ndim != 1:
raise iris.exceptions.CoordinateMultiDimError(coord)
Expand Down