Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
Issue #8141: Dash validator allowing None values in addition to floats #8196
Conversation
QuLogic
added this to the
2.0.1 (next bug fix release)
milestone
Mar 5, 2017
| - def __init__(self, n=None): | ||
| - self.n = n | ||
| + def __init__(self, n=None, allow_none=False): | ||
| + self.n, self.allow_none = n, allow_none |
| - return [float(val) for val in s] | ||
| + return [float(val) | ||
| + if self.allow_none and val is not None | ||
| + or not self.allow_none |
QuLogic
Mar 5, 2017
Member
I think this can be simplified to not self.allow_none or val is not None.
| @@ -929,7 +933,6 @@ def _validate_linestyle(ls): | ||
| raise ValueError("linestyle must be a string or " + | ||
| "an even-length sequence of floats.") | ||
| - |
| @@ -964,7 +967,8 @@ def _validate_linestyle(ls): | ||
| 'lines.dash_capstyle': ['butt', validate_capstyle], | ||
| 'lines.solid_capstyle': ['projecting', validate_capstyle], | ||
| 'lines.dashed_pattern': [[3.7, 1.6], validate_nseq_float()], | ||
| - 'lines.dashdot_pattern': [[6.4, 1.6, 1, 1.6], validate_nseq_float()], | ||
| + 'lines.dashdot_pattern': [[6.4, 1.6, 1, 1.6], | ||
| + validate_nseq_float()], |
|
Thanks @QuLogic. I apologize for the novice mistakes and have made appropriate corrections. This seems to fix the initial problem, but it seems CI is failing -- will investigate further. |
|
It would probably be good to include a test for the regression this PR is fixing. There's a good place in https://github.com/matplotlib/matplotlib/blob/master/lib/matplotlib/tests/test_cycles.py to add in a test. You might also want to think about rebasing the "Fixed" and "Changed" into one commit as it's better PR style. I'm assuming you're doing this for CSCD01? If you are, tell Anya I said hi. |
kenmaca
referenced
this pull request
in kenmaca/matplotlib
Mar 6, 2017
Merged
Issue #8141: Dash validator allowing None values in addition to floats #1
|
I've added a test and cleaned up my commits. Looks like AppVeyor decided to play nice this time -- couldn't figure out why it was failing the single build (likely something unrelated). Also, looks like I forgot to reference the original issue that this PR fixes: #8141 |
|
Looks okay, I think, but can you amend the commit to give the correct first line. |
NelleV
merged commit f7341b9
into matplotlib:master
Mar 8, 2017
5 checks passed
QuLogic
added Needs backport Release critical
labels
Mar 8, 2017
QuLogic
added a commit
to QuLogic/matplotlib
that referenced
this pull request
Mar 27, 2017
|
|
NelleV + QuLogic |
058f6b1
|
QuLogic
removed the
Needs backport
label
Mar 27, 2017
|
Backported to |
kenmaca commentedMar 5, 2017
Validators for dashed linestyles now allow
Noneas an allowed value along with floats if optionalallow_nonekwarg flag invalidate_nseq_float.Other validators that use
validate_nseq_floataren't affected, so this bugfix won't have any breaking changes.