8000 BUG: fix matplotlib warning on CN color by ivanovmg · Pull Request #36981 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

BUG: fix matplotlib warning on CN color #36981

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 12 commits into from
Oct 10, 2020
Merged

BUG: fix matplotlib warning on CN color #36981

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e163302
TST: add failing test
ivanovmg Oct 8, 2020
ff57346
FIX: eliminate warning regarding uppercase color
ivanovmg Oct 8, 2020
29ea95e
CLN: simplify if statements
ivanovmg Oct 8, 2020
a9d125d
REF: drop old way of handling CN colors
ivanovmg Oct 8, 2020
d489a10
REF: move _is_*_color funcs to module level
ivanovmg Oct 8, 2020
aa14f33
TYP/DOC: fix typing, add docs
ivanovmg Oct 8, 2020
749d63a
CLN: remove resetwarnings
ivanovmg Oct 8, 2020
25c0df0
REF: remove function _is_cn_color
ivanovmg Oct 9, 2020
58cebb2
CLN: make if one-liner, reference GH issue
ivanovmg Oct 9, 2020
b4937b6
Merge branch 'master' into warnings/matplotlib
ivanovmg Oct 9, 2020
f003217
FIX: match exact warning message
ivanovmg Oct 9, 2020
4f1178d
Merge branch 'master' into warnings/matplotlib
ivanovmg Oct 9, 2020
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
REF: move _is_*_color funcs to module level
  • Loading branch information
@ivanovmg
ivanovmg committed Oct 8, 2020
commit d489a105b7451206dbdc9ccd84f95593c3a2591b
41 changes: 26 additions & 15 deletions pandas/plotting/_matplotlib/style.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,6 @@ def random_color(column):
raise ValueError("color_type must be either 'default' or 'random'")

if isinstance(colors, str):
conv = matplotlib.colors.ColorConverter()

def _is_cn_color(color: str) -> bool:
return bool(color in ["C" + str(x) for x in range(10)])

def _is_single_color(colors: Union[str, Sequence[str]]) -> bool:
if _is_cn_color(colors):
return True
try:
conv.to_rgba(colors)
except ValueError:
return False
else:
return True

if _is_single_color(colors):
Copy link
Member

Choose a reason for hiding this comment

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

maybe put it in one line?

`if isinstance(colors, str) and _is_single_color(colors)`

also nice to put an issue number below this line for future reference!

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

colors = [colors]

Expand All @@ -90,3 +75,29 @@ def _is_single_color(colors: Union[str, Sequence[str]]) -> bool:
colors += colors[:mod]

return colors


def _is_cn_color(color: str) -> bool:
"""Check if color string is CN color, like 'C0', 'C1', etc."""
return bool(color in ["C" + str(x) for x in range(10)])


def _is_single_color(colors: Union[str, Sequence[str]]) -> bool:
"""Check if ``colors`` is a single color.

Examples of single colors:
- 'r'
- 'g'
- 'red'
- 'green'
- 'C3'
"""
conv = matplotlib.colors.ColorConverter()
if _is_cn_color(colors):
return True
try:
conv.to_rgba(colors)
except ValueError:
return False
else:
return True
< 2954 /div>
0