Skip to content

converted assert into exception #3060

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 36 commits into from
Mar 22, 2015
Merged

converted assert into exception #3060

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
873e91d
converted assert into exception
montefra May 13, 2014
b297f41
Exception type modified according to @pelson comment
montefra May 26, 2014
187f584
removed assert in `draw_artist` and `redraw_in_frame`
montefra May 26, 2014
34c6a5f
most asserts modified to ValueError
montefra May 26, 2014
0c1f9f7
All asserts substituted by ValueError
montefra May 28, 2014
4cfa781
method name explicitly written in the message
montefra May 28, 2014
aba9d99
Most asserts changed to ValueErrors. Two changed to warning
montefra May 28, 2014
8fbb652
c* files done
montefra May 30, 2014
5a45046
assert removed
montefra May 30, 2014
33fdabe
Asserts removed. Side effect: function to check that the inputs have …
montefra May 30, 2014
67bdfea
Asserts removed throughout the files m*
montefra Jun 3, 2014
531004c
Asserts removed throughout the files r*
montefra Jun 3, 2014
eaca138
SyntaxError from Travis corrected
montefra Jun 3, 2014
9e4b911
assert removed from files s*
montefra Jun 3, 2014
d12fbb8
asserts removed from t* file. test and tri directories ignored
montefra Jun 4, 2014
7f80628
asserts removed from [u-z]* files
montefra Jun 4, 2014
4fc36c6
the only assert in a python public function removed
montefra Jun 4, 2014
617b622
Bug introduced while getting rid of the asserts fixed
montefra Jun 18, 2014
2cbb326
typo fixed (broke building documentation)
montefra Mar 5, 2015
20966e9
pep8 fixed. plot_day_summary2 removed (retained by error when rebasing)
montefra Mar 5, 2015
96c733e
PEP8 fixed
montefra Mar 5, 2015
140210f
PEP8 fixed - image.py
montefra Mar 5, 2015
a2abc7b
PEP 8 fixed - mlab.py
montefra Mar 5, 2015
25cec22
PEP 8 fixed - patches.py
montefra Mar 5, 2015
06aedf7
PEP8 fixed - path.py
montefra Mar 5, 2015
77da3b6
PEP8 fixed - sankey.py
montefra Mar 5, 2015
95ae2cd
PEP8 fixed - spines.py, table.py
montefra Mar 5, 2015
b167c0c
test adapted to code change (AssertionError -> ValueError)
montefra Mar 5, 2015
f9792a9
fixed according to #3060 comment
montefra Mar 5, 2015
850178e
Two bugs in assert -> exception transformation fixed
montefra Mar 5, 2015
c0ebd4f
Typo fixed
montefra Mar 5, 2015
6b6d2de
Bug in assert -> exception transformation fixed
montefra Mar 5, 2015
088542e
Typo fixed
montefra Mar 5, 2015
41bf6b5
Modified according to @tacaswell comments
montefra Mar 16, 2015
7ea5c1a
fixed pep8 Travis failure
montefra Mar 16, 2015
d6c3c32
python2.6 string formatting. style more uniform
montefra Mar 22, 2015
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
Prev Previous commit
Next Next commit
Most asserts changed to ValueErrors. Two changed to warning
  • Loading branch information
@montefra
montefra committed Mar 4, 2015
commit aba9d99b9ff780eba9b4cf578dbf3d357dc12e69
6 changes: 5 additions & 1 deletion lib/matplotlib/backend_bases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,7 +969,11 @@ def set_clip_path(self, path):
Set the clip path and transformation. Path should be a
:class:`~matplotlib.transforms.TransformedPath` instance.
"""
assert path is None or isinstance(path, transforms.TransformedPath)
if path is not None and not isinstance(path,
transforms.TransformedPath):
msg = "Path should be a matplotlib.transforms.TransformedPath \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use () line continuation here, not \ ?

instance."
raise ValueError(msg)
self._clippath = path

def set_dashes(self, dash_offset, dash_list):
Expand Down
22 changes: 13 additions & 9 deletions lib/matplotlib/blocking_input.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
from matplotlib.cbook import is_sequence_of_strings
import matplotlib.lines as mlines

import warnings


class BlockingInput(object):
"""
Expand All @@ -38,8 +40,8 @@ class BlockingInput(object):
"""
def __init__(self, fig, eventslist=()):
self.fig = fig
assert is_sequence_of_strings(
eventslist), "Requires a sequence of event name strings"
if not is_sequence_of_strings(eventslist):
raise ValueError("Requires a sequence of event name strings")
self.eventslist = eventslist

def on_event(self, event):
Expand Down Expand Up @@ -95,7 +97,8 @@ def __call__(self, n=1, timeout=30):
Blocking call to retrieve n events
"""

assert isinstance(n, int), "Requires an integer argument"
if not isinstance(n, int):
raise ValueError("Requires an integer argument")
self.n = n

self.events = []
Expand Down Expand Up @@ -146,9 +149,9 @@ def post_event(self):
"""
This will be called to process events
"""
assert len(self.events) > 0, "No events yet"

if self.events[-1].name == 'key_press_event':
if len(self.events) <= 0:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Length should never be negative, should probably use == here?

warnings.warn("No events yet")
elif self.events[-1].name == 'key_press_event':
self.key_event()
else:
self.mouse_event()
Expand Down Expand Up @@ -359,9 +362,10 @@ def post_event(self):
"""
Determines if it is a key event
"""
assert len(self.events) > 0, "No events yet"

self.keyormouse = self.events[-1].name == 'key_press_event'
if len(self.events) <= 0:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above, use == instead?

warnings.warn("No events yet")
else:
self.keyormouse = self.events[-1].name == 'key_press_event'

def __call__(self, timeout=30):
"""
Expand Down